[Pkg-voip-commits] [asterisk] 01/02: Merge tag 'upstream/11.6.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 d8dcf60090d5d2b6c6297260b0450bb75190f8c4
Merge: e6434e1 b22c118
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Tue Dec 17 19:41:23 2013 +0200

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

 .version                           |   2 +-
 ChangeLog                          |  29 ++
 README-SERIOUSLY.bestpractices.txt |  24 ++
 UPGRADE.txt                        |   8 +
 apps/app_sms.c                     |   5 +-
 asterisk-11.6.0-summary.html       | 581 ----------------------------
 asterisk-11.6.0-summary.txt        | 761 -------------------------------------
 asterisk-11.6.1-summary.html       |  74 ++++
 asterisk-11.6.1-summary.txt        | 104 +++++
 configs/asterisk.conf.sample       |   6 +
 funcs/func_db.c                    |  22 +-
 funcs/func_env.c                   |  30 +-
 funcs/func_lock.c                  |  23 +-
 funcs/func_realtime.c              |  64 ++--
 funcs/func_shell.c                 |  20 +-
 include/asterisk/pbx.h             |  54 +++
 main/asterisk.c                    |   7 +-
 main/pbx.c                         | 256 ++++++++++++-
 main/tcptls.c                      |  13 +-
 19 files changed, 692 insertions(+), 1391 deletions(-)

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