[Pkg-voip-commits] [janus] 34/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 007304003a432e1cf76f8de34deb7a4f150ca782
Merge: 9d063d4 623883d
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Wed May 3 14:52:55 2017 +0200

    Merge branch 'master' into nosip

 CONTRIBUTING.md => .github/CONTRIBUTING.md |  0
 .github/ISSUE_TEMPLATE.md                  |  9 +++++++++
 ice.c                                      | 18 ++++++++++++++++++
 plugins/janus_audiobridge.c                |  2 +-
 plugins/janus_streaming.c                  |  2 +-
 plugins/janus_textroom.c                   |  2 +-
 rtcp.c                                     | 28 ++++++++++++++++++++++++++++
 rtcp.h                                     |  6 ++++++
 transports/janus_http.c                    |  2 +-
 9 files changed, 65 insertions(+), 4 deletions(-)

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