[Pkg-samba-maint] [samba] 02/02: Merge branch 'master' of git://git.debian.org/git/pkg-samba/samba

[Christian Perrier]

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

bubulle pushed a commit to branch master
in repository samba.

commit 55b25aa5bca17a78dccb397a43072884f6df6a22
Merge: 6001cc0 5888494
Author: Christian PERRIER <bubulle at debian.org>
Date:   Mon Oct 28 22:31:33 2013 +0100

    Merge branch 'master' of git://git.debian.org/git/pkg-samba/samba

 debian/changelog                         |    4 ++++
 debian/control                           |    4 ++--
 debian/samba-libs.install                |    1 -
 debian/samba-testsuite.install           |    1 +
 debian/samba-testsuite.lintian-overrides |    3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index 3d40670,67e5d6e..42790c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -13,8 -13,11 +13,12 @@@ samba (2:4.0.10+dfsg-4) UNRELEASED; urg
    * Esperanto (Felipe Castro).  Closes: #727619
    * Polish (Michał Kułach).  Closes: #727646
    * Danish (Joe Hansen).  Closes: #727764
 +  * Czech (Miroslav Kure).  Closes: #728100
  
+   [ Jelmer Vernooij ]
+   * Move libtorture0 to samba-testsuite to reduce size of samba-libs and
+     prevent dependency on libsubunit0.
+ 
   -- Christian Perrier <bubulle at debian.org>  Tue, 22 Oct 2013 20:29:59 +0200
  
  samba (2:4.0.10+dfsg-3) unstable; urgency=low

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