[Pkg-voip-commits] [janus] 31/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 fa33340a58443f7c0990d073954bfc7c979fb5cd
Merge: 4aa1efb b4393f4
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Apr 27 11:13:02 2017 +0200

    Merge branch 'master' into sipre

 config.c                | 14 +++++++-------
 mainpage.dox            |  6 ++++++
 transports/janus_http.c | 28 ++++++++++++++++++++++++----
 3 files changed, 37 insertions(+), 11 deletions(-)

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