From: Jelmer Vernooij Date: Fri, 31 Oct 2008 01:49:43 +0000 (+0100) Subject: Merge branch 'master' of git://git.samba.org/samba X-Git-Tag: samba-4.0.0alpha6~600^2~1 X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=f6c3710d4127c7c2ab63578117048c2a18ee2d64 Merge branch 'master' of git://git.samba.org/samba --- f6c3710d4127c7c2ab63578117048c2a18ee2d64