From: Jelmer Vernooij Date: Tue, 21 Oct 2008 13:53:28 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=febd55b1bfb3a93d905bb1a1903fc28e88d2a497;hp=febd55b1bfb3a93d905bb1a1903fc28e88d2a497 Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv ---