[Pkg-samba-maint] [samba] 25/26: Merge tag 'upstream/4.0.13+dfsg' into samba_4.1

[Ivo De Decker]

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

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

commit 404b15707214d48a9af1597c21ab792be7957903
Merge: 16ab2ff 37b9678
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Mon Dec 9 23:02:13 2013 +0100

    Merge tag 'upstream/4.0.13+dfsg' into samba_4.1
    
    Empty merge of upstream from 4.0 to make the merge of the master branch
    easier. No actual changes from the upstream 4.0 branch are applied.


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