[Pkg-voip-commits] [janus] 12/282: Merge branch 'master' into nosip

[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 3ee79cdbe9cfe829571abd96efcdc26370b655fe
Merge: 7d5c4f9 3e1b4d9
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Thu Mar 9 12:45:47 2017 +0100

    Merge branch 'master' into nosip

 ice.c                       |  59 ++++++++++------
 ice.h                       |   8 ++-
 janus.c                     |   1 +
 plugins/janus_audiobridge.c |   4 +-
 plugins/janus_echotest.c    |   3 +-
 plugins/janus_recordplay.c  | 164 +++++++++++++++++++-------------------------
 plugins/janus_sip.c         |   3 +-
 plugins/janus_streaming.c   |   3 +-
 plugins/janus_textroom.c    |   2 +-
 plugins/janus_videocall.c   |   3 +-
 plugins/janus_videoroom.c   |   3 +-
 plugins/janus_voicemail.c   |   3 +-
 12 files changed, 124 insertions(+), 132 deletions(-)

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