[Pkg-voip-commits] [janus] 72/282: Merge branch 'master' into sipre

[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 51b1cd0d0c3a586cc8b3b54553e1078066be189a
Merge: 78abaf5 45fd83d
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon Jun 19 15:06:52 2017 +0200

    Merge branch 'master' into sipre

 conf/janus.transport.http.cfg.sample.in |  5 ++++-
 html/devicetest.js                      |  5 +++++
 html/echotest.js                        | 13 +++++--------
 html/videocalltest.js                   | 13 +++++--------
 html/videoroomtest.js                   |  5 +++++
 plugins/janus_sip.c                     | 11 ++++++-----
 transports/janus_http.c                 | 22 ++++++++++++++++++++--
 7 files changed, 50 insertions(+), 24 deletions(-)

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