[Pkg-voip-commits] [janus] 36/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 e12f1647ead4229ad549474b18a657d0f9415934
Merge: 2622ffb abc490f
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu May 11 10:55:55 2017 +0200

    Merge branch 'master' into sipre

 html/siptest.js     | 22 ++++++++++------------
 mainpage.dox        |  5 +++++
 plugins/janus_sip.c | 30 +++++++++++++-----------------
 3 files changed, 28 insertions(+), 29 deletions(-)

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