[Pkg-voip-commits] [janus] 40/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 fd8d681fa5e1a740491e348944c51b2883c8416c
Merge: 23635d9 ae7b795
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Jul 27 16:56:49 2017 +0200

    Merge branch 'master' into vp9-svc

 dtls-bio.c              |   2 +-
 transports/janus_http.c | 161 ++++++++++--------------------------------------
 2 files changed, 34 insertions(+), 129 deletions(-)

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