From: Jelmer Vernooij Date: Fri, 31 Oct 2008 23:34:39 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba X-Git-Tag: samba-4.0.0alpha6~589 X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=72a1e3acfa5789134a28fb0609bc88b25c0e0b15 Merge branch 'master' of ssh://git.samba.org/data/git/samba --- 72a1e3acfa5789134a28fb0609bc88b25c0e0b15