[Pkg-voip-commits] [janus] 69/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 42c2db19608834b021848ed68bf8cc686ba669f7
Merge: 6797864 4d769df
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Jun 14 12:59:04 2017 +0200

    Merge branch 'master' into nosip

 html/audiobridgetest.js |  12 ++-
 html/siptest.html       |  13 +--
 html/siptest.js         |  36 +++++++-
 html/textroomtest.js    |  12 ++-
 html/videoroomtest.js   |  19 ++++-
 plugins/janus_sip.c     | 222 +++++++++++++++++++++++++++++++-----------------
 6 files changed, 219 insertions(+), 95 deletions(-)

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