[Pkg-voip-commits] [asterisk] 01/04: Merge tag 'upstream/12.1.1_dfsg1' into experimental

[Frederic Van Espen]

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

freshter-guest pushed a commit to branch experimental
in repository asterisk.

commit a5efc5e3fc7a66f37842adc26f2b1acee07ded0d
Merge: d698175 5715946
Author: Frederic Van Espen <frederic.ve at gmail.com>
Date:   Thu Mar 13 08:54:55 2014 +0100

    Merge tag 'upstream/12.1.1_dfsg1' into experimental
    
    Upstream version 12.1.1~dfsg1

 .version                      |    2 +-
 ChangeLog                     |   41 ++
 asterisk-12.1.0-summary.html  |  812 -------------------------------
 asterisk-12.1.0-summary.txt   | 1056 -----------------------------------------
 asterisk-12.1.1-summary.html  |   65 +++
 asterisk-12.1.1-summary.txt   |   97 ++++
 channels/chan_sip.c           |  305 ++++++------
 main/http.c                   |   54 ++-
 res/res_pjsip.c               |    2 +-
 res/res_pjsip/pjsip_options.c |    4 +-
 10 files changed, 401 insertions(+), 2037 deletions(-)

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