From: Jelmer Vernooij Date: Fri, 24 Oct 2008 02:19:08 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba X-Git-Tag: samba-4.0.0alpha6~699 X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=2cabbb2eeb7d62f8df1c4d20d90adbd53828dd8a Merge branch 'master' of ssh://git.samba.org/data/git/samba --- 2cabbb2eeb7d62f8df1c4d20d90adbd53828dd8a