[Pkg-samba-maint] [samba] 02/02: Merge branch 'master' into samba_4.0
Ivo De Decker
idd-guest at alioth.debian.org
Tue Oct 15 06:40:00 UTC 2013
This is an automated email from the git hooks/post-receive script.
idd-guest pushed a commit to branch master
in repository samba.
Merge: 2fa5c80 bca8ea9
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Tue Oct 15 08:36:35 2013 +0200
Merge branch 'master' into samba_4.0
This merge was done with '-s ours' and was done purely to make git think the
merge happened, to move master to samba_4.0.
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint