[Pkg-voip-commits] [janus] 137/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 302962d60813c070dbd29215e533c79facbe36a6
Merge: 5f6a731 450c62e
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Oct 20 15:28:10 2017 +0200

    Merge branch 'master' into sipre

 conf/janus.plugin.audiobridge.cfg.sample |  10 ++
 conf/janus.plugin.sip.cfg.sample         |   3 +
 janus.c                                  |   2 +-
 plugins/janus_audiobridge.c              | 202 ++++++++++++++++++++++++-------
 plugins/janus_sip.c                      |  28 ++++-
 rtp.c                                    |   6 +-
 6 files changed, 199 insertions(+), 52 deletions(-)


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