[Pkg-voip-commits] [janus] 30/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 f5bbafb237600d3da7594935b91bb4a35f4ecb37
Merge: 732ec87 b4393f4
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Apr 27 11:12:18 2017 +0200

    Merge branch 'master' into nosip

 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