[Pkg-voip-commits] [asterisk] 02/03: Merge tag 'upstream/11.13.1_dfsg'

[tzafrir at debian.org]

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

tzafrir pushed a commit to branch master
in repository asterisk.

commit 3d6e3ee04c9b3f949fef5fbef1dd925d73d24695
Merge: 5e4a43f dbd07fb
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sun Oct 26 05:30:12 2014 +0200

    Merge tag 'upstream/11.13.1_dfsg'
    
    Upstream version 11.13.1~dfsg
    
    (Manually fixed merge to remove 11.13.0 summary files)

 .version                      |   2 +-
 ChangeLog                     |  26 ++++
 UPGRADE.txt                   |  12 ++
 asterisk-11.13.0-summary.html | 237 -------------------------------
 asterisk-11.13.0-summary.txt  | 321 ------------------------------------------
 asterisk-11.13.1-summary.html |  65 +++++++++
 asterisk-11.13.1-summary.txt  |  95 +++++++++++++
 main/tcptls.c                 |  24 +++-
 res/res_jabber.c              |   7 +-
 res/res_xmpp.c                |   8 +-
 10 files changed, 228 insertions(+), 569 deletions(-)

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