[Pkg-voip-commits] [asterisk] 02/02: Merge branch 'master' into wheezy-backports

[Jeremy Lainé]

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

sharky pushed a commit to branch wheezy-backports
in repository asterisk.

commit 5918e71fb3c63caf09f08bc0c22191d372102d15
Merge: b190582 465b50f
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Thu Aug 28 15:54:05 2014 +0200

    Merge branch 'master' into wheezy-backports

 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 0d74275,af15114..c996853
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,9 @@@
 +asterisk (1:11.12.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Backport to wheezy.
 +
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Wed, 20 Aug 2014 15:55:30 +0200
++ -- Jeremy Lainé <jeremy.laine at m4x.org>  Thu, 28 Aug 2014 15:54:39 +0200
 +
  asterisk (1:11.12.0~dfsg-1) unstable; urgency=medium
  
    * New upstream release.

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