[Pkg-voip-commits] [janus] 216/282: Merge remote-tracking branch 'origin/master' into iceloop-sessions-mgmt

[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 615b8646b2b46ed6b585833950e8082630d8e12a
Merge: 18f61d4 31a9e4a
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Wed Nov 29 14:40:25 2017 +0100

    Merge remote-tracking branch 'origin/master' into iceloop-sessions-mgmt

 html/videoroomtest.js     |  2 +-
 ice.c                     | 60 ++++++++++++++++++++++++++++++++---------------
 plugins/janus_textroom.c  | 12 +++++-----
 sctp.c                    | 34 +++++++++++++--------------
 transports/janus_pfunix.c | 38 +++++++++++++++++-------------
 5 files changed, 87 insertions(+), 59 deletions(-)


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