Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
authorJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 13:53:28 +0000 (15:53 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 21 Oct 2008 13:53:28 +0000 (15:53 +0200)
commitfebd55b1bfb3a93d905bb1a1903fc28e88d2a497
treed8541a064d4940e3e5a4ce1cf3884e031144f15c
parentfdf0d9bbb89155e5bd793729468dc457448054e5
parent5cc4a84583d027b54e26a9c42a89b7b8a6b6c67d
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv