[Pkg-voip-commits] [janus] 133/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 b6b2aa3fa14f1e01e5aa7473cfc741fd1d31070e
Merge: 6e15362 4e867f4
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Oct 20 14:58:58 2017 +0200

    Merge branch 'master' into nosip

 conf/janus.plugin.audiobridge.cfg.sample |  10 ++
 plugins/janus_audiobridge.c              | 202 ++++++++++++++++++++++++-------
 rtp.c                                    |   6 +-
 3 files changed, 169 insertions(+), 49 deletions(-)

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