[Pkg-samba-maint] [samba] 02/02: Merge branch 'upstream_4.0' into samba_4.0

[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
in repository samba.

commit a1ea48c4f589ace1e2920ddbfa1565d836fd0c6d
Merge: ca43334 880f2d7
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Sun Aug 11 10:27:14 2013 +0200

    Merge branch 'upstream_4.0' into samba_4.0


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