[Pkg-voip-commits] [janus] 32/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 9d063d455d3ca78b5881087da4db0901407f2275
Merge: f5bbafb d2ec9c5
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Apr 27 21:15:50 2017 +0200

    Merge branch 'master' into nosip

 html/janus.js               | 17 ++++++++++-------
 html/janus.nojquery.js      | 17 ++++++++++-------
 ice.c                       |  4 ++--
 plugins/janus_audiobridge.c |  4 +++-
 plugins/janus_recordplay.c  |  8 ++++++--
 plugins/janus_streaming.c   |  2 +-
 plugins/janus_videoroom.c   |  6 ++++--
 7 files changed, 36 insertions(+), 22 deletions(-)

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