[Pkg-voip-commits] [janus] 13/163: Merge branch 'master' into vp8-simulcast

[Jonas Smedegaard]

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

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

commit a262277b81f36163628eacbbe93d3d1a2c081fbc
Merge: 3d67fa8 d5aa39e
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Jul 5 16:38:21 2017 +0200

    Merge branch 'master' into vp8-simulcast

 Makefile.am              |   8 +-
 configure.ac             |   1 +
 html/janus.js            |   9 +-
 html/janus.nojquery.js   |  13 +--
 html/siptest.html        |   2 +
 html/siptest.js          |  11 ++
 plugins/janus_sip.c      | 264 ++++++++++++++++++++++++++++++++++++++++++-----
 plugins/janus_textroom.c |   3 +-
 8 files changed, 273 insertions(+), 38 deletions(-)


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