[Pkg-voip-commits] [janus] 46/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 69880a4d238343945d7f2adc68f4a7d161353785
Merge: ea103ae 0f070c2
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu May 25 17:34:40 2017 +0200

    Merge branch 'master' into nosip

 html/janus.js          |  4 ++--
 html/janus.nojquery.js |  4 ++--
 plugins/janus_sip.c    | 30 +++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

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