[Pkg-voip-commits] [asterisk] 02/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-voip/asterisk

[Jeremy Lainé]

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

sharky pushed a commit to branch master
in repository asterisk.

commit 942ab509d5a1b484f500c821276faad9f3250ad6
Merge: ae687ac 46a0244
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Tue Dec 10 20:26:14 2013 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-voip/asterisk
    
    Conflicts:
    	debian/changelog

 debian/asterisk.init | 1 +
 debian/changelog     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 7b65c4d,70db72e..72c1fce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,13 @@@
 -asterisk (1:11.6.0~dfsg-2) UNRELEASED; urgency=low
 +asterisk (1:11.6.0~dfsg-2) UNRELEASED; urgency=medium
  
++  [ Jeremy Lainé ]
 +  * Do not build astdb2* (GPL linked against 4-clause BSD).
++  
++  [ Tzafrir Cohen ]
+   * Restore SE Linux settings on directories created in init script
+     (Russell Coker, Closes: #731397). 
  
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Tue, 10 Dec 2013 20:23:27 +0100
+  -- Tzafrir Cohen <tzafrir at debian.org>  Tue, 10 Dec 2013 16:50:39 +0200
  
  asterisk (1:11.6.0~dfsg-1) unstable; urgency=low
  

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