[Pkg-samba-maint] [samba] 01/01: Merge branch 'init-script-split-and-upstart-jobs'

[Steve Langasek]

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

vorlon pushed a commit to branch master
in repository samba.

commit 674c7332341b5f42a3de1749ea56cf20ecb5bd29
Merge: 49a1d61 7c67ef5
Author: Steve Langasek <steve.langasek at canonical.com>
Date:   Thu Aug 15 08:27:29 2013 +0200

    Merge branch 'init-script-split-and-upstart-jobs'

 debian/rules             |    1 +
 debian/samba.init        |   43 +++++++++++++++++++++++++++++++++++++++++++
 debian/samba.maintscript |    1 -
 debian/samba.postinst    |    2 --
 4 files changed, 44 insertions(+), 3 deletions(-)

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