[Pkg-voip-commits] [janus] 134/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 e836799fa9d74dbf44365741269351fc3dc2a847
Merge: b6b2aa3 450c62e
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Fri Oct 20 15:15:30 2017 +0200

    Merge branch 'master' into nosip

 conf/janus.plugin.sip.cfg.sample |  3 +++
 janus.c                          |  2 +-
 plugins/janus_sip.c              | 28 ++++++++++++++++++++++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)

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