[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 b141b0dbfdf7103aba8692b5a50af7fc90c9f3e8
Merge: 188bb51 d9d390f
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Mon Jun 2 09:09:01 2014 +0200

    Merge branch 'master' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 debian/asterisk.init | 34 +++++++++-------------------------
 debian/changelog     | 10 ++++++++--
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index 0f69a5d,fe2ebef..29ca704
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- asterisk (1:11.9.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
++asterisk (1:11.9.0~dfsg-2~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Backport to wheezy.
 +
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Mon, 26 May 2014 23:24:37 +0200
++ -- Jeremy Lainé <jeremy.laine at m4x.org>  Mon, 02 Jun 2014 09:08:47 +0200
++
+ asterisk (1:11.9.0~dfsg-2) unstable; urgency=medium
+ 
+   * Rollback changes to init script (Closes: #749024).
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Tue, 27 May 2014 09:17:06 +0200
  
  asterisk (1:11.9.0~dfsg-1) unstable; urgency=medium
  

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