[Pkg-voip-commits] [kamailio] 03/03: Merge branch 'master' of git://anonscm.debian.org/pkg-voip/kamailio

[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 kamailio.

commit 69ba54f3f9f896d66f9b3c80bdb3b9cc97c2a060
Merge: 7d3375b 7804fa3
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date:   Mon Feb 24 13:13:46 2014 +0200

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

 debian/changelog        |  5 ++++-
 debian/kamailio.default |  9 +++++++--
 debian/kamailio.init    | 19 ++++++++++++-------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 816bdff,cbd5ab0..e980f0d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,17 @@@
 -kamailio (4.1.1-3) UNRELEASED; urgency=medium
 +kamailio (4.1.1-4) UNRELEASED; urgency=low
  
-  -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 24 Feb 2014 13:11:11 +0200
 -  * fix init script
 -  * use freeradius-client. (Closes: #739286)
+   * new vars to configure shared and private memory
+     and path for the configuration file.
+ 
 - -- Victor Seva <linuxmaniac at torreviejawireless.org>  Fri, 21 Feb 2014 10:05:33 +0100
++ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Mon, 24 Feb 2014 13:11:11 +0200
 +
 +kamailio (4.1.1-3) unstable; urgency=medium
 +
 +  [ Victor Seva ]
 +  * fix init script
 +  * use freeradius-client. (Closes: #739286)
 +
 + -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 23 Feb 2014 22:54:28 +0200
  
  kamailio (4.1.1-2) unstable; urgency=medium
  

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