[Pkg-voip-commits] [janus] 94/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 47eb485376ad1c7a881d4e2415061cae1032c6fb
Merge: 8a32bb7 ae7b795
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Jul 27 16:57:47 2017 +0200

    Merge branch 'master' into nosip

 conf/janus.transport.http.cfg.sample.in |   9 ++
 dtls-bio.c                              |   2 +-
 plugins/janus_videoroom.c               |  12 ---
 transports/janus_http.c                 | 140 ++++++++++----------------------
 4 files changed, 54 insertions(+), 109 deletions(-)

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