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

    Merge branch 'master' into nosip

 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