[Pkg-voip-commits] [janus] 101/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 3a8c675b22084b9f303eb1ee5fc00044b214f0f4
Merge: cf60f93 aa880c1
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Aug 2 15:07:11 2017 +0200

    Merge branch 'master' into sipre

 janus.c                     |  21 +++++-
 plugins/janus_audiobridge.c | 170 +++++++++++++++++++++++++++++++++++++++++---
 plugins/janus_textroom.c    | 127 ++++++++++++++++++++++++++++++++-
 plugins/janus_videoroom.c   | 142 +++++++++++++++++++++++++++++++++++-
 4 files changed, 444 insertions(+), 16 deletions(-)

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