[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, master, updated. 1178e147a3bcc9f7f872dc1a57ae89ac05cb6d0f

[Ivo De Decker]

The following commit has been merged in the master branch:
commit da999e7c7ae0a189d74c6345f1e0c21d7e4825de
Merge: 6ce064ce49eb6875ccf1172fd871c05b110bf6a8 14ebdf4332b12add5c19807a14b377671356e780
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Thu May 9 10:36:48 2013 +0200

    Merge branch 'upstream'
    
    This merge is just here to make the merge of samba 3.6.15 succeed in the new
    git repo, which was converted from svn. Without this merge, git doesn't know
    the converted svn branches are related and the merge fails. With this merge,
    the next merge succeeds.


-- 
Debian packaging for Samba