[Pkg-voip-commits] [janus] 58/163: Merge branch 'master' into js-track

[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 46a4e2e7591b0766c5a756ebbf70121d8a4f1bd2
Merge: 57eb0e3 aa880c1
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed Aug 2 15:07:07 2017 +0200

    Merge branch 'master' into js-track

 janus.c                     |  21 +++++-
 plugins/janus_audiobridge.c | 170 +++++++++++++++++++++++++++++++++++++++++---
 plugins/janus_textroom.c    | 127 ++++++++++++++++++++++++++++++++-
 plugins/janus_videoroom.c   | 142 +++++++++++++++++++++++++++++++++++-
 4 files changed, 444 insertions(+), 16 deletions(-)

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