[Pkg-voip-commits] [asterisk] 01/01: Merge tag 'upstream/11.10.1_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 6613a281ee6da665241fb4d995749b77405921bb
Merge: 723a120 118dc78
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Jun 13 21:58:25 2014 +0200

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

 .version                      |   2 +-
 ChangeLog                     |  58 +++++
 UPGRADE.txt                   |  13 +
 apps/app_mixmonitor.c         |   8 +-
 asterisk-11.10.0-summary.html | 400 -------------------------------
 asterisk-11.10.0-summary.txt  | 500 ---------------------------------------
 asterisk-11.10.1-summary.html |  72 ++++++
 asterisk-11.10.1-summary.txt  | 103 ++++++++
 channels/chan_sip.c           |   6 +-
 configs/http.conf.sample      |   6 +
 include/asterisk/tcptls.h     |  47 ++++
 include/asterisk/utils.h      |   1 +
 main/http.c                   |  36 ++-
 main/manager.c                |  75 +++---
 main/tcptls.c                 | 538 +++++++++++++++++++++++++++++++++++-------
 main/utils.c                  |  21 +-
 res/res_http_websocket.c      |   9 +-
 17 files changed, 855 insertions(+), 1040 deletions(-)

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