[Pkg-voip-commits] [asterisk] 01/01: Merge tag 'upstream/11.10.2_dfsg'

[Jeremy Lainé]

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

sharky pushed a commit to branch master
in repository asterisk.

commit ae644bc45ea4282f18298098d3bfa513efc5bee0
Merge: 6613a28 daa379f
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Jun 13 22:01:56 2014 +0200

    Merge tag 'upstream/11.10.2_dfsg'
    
    Upstream version 11.10.2~dfsg

 .version                                           |  2 +-
 ChangeLog                                          | 11 ++++++
 ...1-summary.html => asterisk-11.10.2-summary.html | 40 +++++++++-----------
 ...0.1-summary.txt => asterisk-11.10.2-summary.txt | 44 +++++++++++-----------
 channels/chan_sip.c                                |  8 +++-
 include/asterisk/tcptls.h                          | 16 +++++++-
 main/http.c                                        |  5 ++-
 main/manager.c                                     |  8 +++-
 main/tcptls.c                                      | 19 +++++++++-
 9 files changed, 102 insertions(+), 51 deletions(-)

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