[Pkg-voip-commits] [janus] 05/163: Merge branch 'master' into vp9-svc

[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 06f364af25f9d5c302288aa44ba98ea16d81b52f
Merge: f28d8b3 0ee763b
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Jun 22 15:05:27 2017 +0200

    Merge branch 'master' into vp9-svc

 plugins/janus_sip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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