[Pkg-voip-commits] [ring] 02/06: Merge tag 'upstream/20160720.1.5c40734_dfsg1'

[Alexandre Viau]

This is an automated email from the git hooks/post-receive script.

aviau pushed a commit to branch master
in repository ring.

commit c689b370b419b5cbcd40057e990a788e4b371879
Merge: 96efcc3 4066846
Author: aviau <alexandre at alexandreviau.net>
Date:   Wed Jul 20 11:22:20 2016 -0400

    Merge tag 'upstream/20160720.1.5c40734_dfsg1'
    
    Upstream version 20160720.1.5c40734~dfsg1

 client-gnome/src/video/video_widget.cpp |   2 +-
 daemon/configure.ac                     |  14 --
 daemon/contrib/src/natpmp/SHA512SUMS    |   1 -
 daemon/contrib/src/natpmp/rules.mak     |  21 --
 daemon/src/manager.cpp                  |  18 +-
 daemon/src/ringdht/ringaccount.cpp      |  33 +--
 daemon/src/sip/sipaccount.cpp           |  15 +-
 daemon/src/upnp/upnp_context.cpp        | 403 ++++++++------------------------
 daemon/src/upnp/upnp_context.h          | 124 +++++-----
 daemon/src/upnp/upnp_control.cpp        |  18 +-
 daemon/src/upnp/upnp_igd.h              |  93 ++------
 11 files changed, 237 insertions(+), 505 deletions(-)

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