[Pkg-voip-commits] [janus] 23/163: Merge branch 'master' into vp8-simulcast

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.

commit 11569201831d93957df18b92ef8841b068520117
Merge: 50162f9 1f40218
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Tue Jul 11 14:35:21 2017 +0200

    Merge branch 'master' into vp8-simulcast

 plugins/janus_sip.c     | 7 +++++++
 sdp-utils.c             | 2 +-
 transports/janus_http.c | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

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