[Pkg-voip-commits] [janus] 52/282: Merge branch 'master' into sipre

[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 aef4808555ceb6e975b2e8eaefbf90334eb170e3
Merge: d37db07 215ea54
Author: Lorenzo Miniero <lminiero at gmail.com>
Date:   Mon May 29 18:19:38 2017 +0200

    Merge branch 'master' into sipre

 dtls.c  | 14 +-------------
 ice.c   | 36 +++++++++++++++++++++---------------
 ice.h   |  5 +++--
 janus.c |  4 ++--
 4 files changed, 27 insertions(+), 32 deletions(-)

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