[Pkg-samba-maint] [samba] 05/05: update changelog

[Ivo De Decker]

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

idd-guest pushed a commit to branch samba_4.0_integrate
in repository samba.

commit 51897151e7ae3b700440fb9e5cca9a6c293dd4cc
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sun Sep 8 19:14:11 2013 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 829fa65..76da2da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,9 +15,11 @@ samba (2:4.0.9+dfsg-1) UNRELEASED; urgency=low
   * samba: Remove inetd servers from suggests; inetd support was dropped
     in 3.6.16-1.
   * Fix database errors during upgrade. Closes: #700768
+  * Integrate libraries in samba-libs
 
   [ Ivo De Decker ]
   * New upstream release.
+  * Merge contents of samba-ad-dc into samba
 
  -- Steve Langasek <vorlon at debian.org>  Fri, 16 Aug 2013 02:00:12 +0200
 

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