[Pkg-voip-commits] [janus] 13/282: Merge branch 'master' into nosip

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit 2f29bec860007c34c2e73c8eeb76446a66d74035
Merge: 3ee79cd d905174
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Mar 14 13:40:34 2017 +0100

    Merge branch 'master' into nosip

 Makefile.am               |  15 +++++++++++----
 html/up_arrow.png         | Bin 5327 -> 2611 bytes
 ice.c                     |   2 +-
 janus.1                   |   3 +++
 plugins/janus_videocall.c |  20 +-------------------
 record.c                  |  13 ++++++++++++-
 6 files changed, 28 insertions(+), 25 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git