Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs
authorJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 11:32:38 +0000 (13:32 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 11:32:38 +0000 (13:32 +0200)
commitdcc44f1757e24e169ca7730a5c56a0488cd5b110
tree8192a866e717df5a2788cb65bc11682b319cc9dc
parent8dd6f735bc6ff65a364ac65572529e8abf6f130a
parent0e59c73fe3a5cde76881294f17bf6ca9258f67a1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs
(This used to be commit c8dbf00b4490d804e1aac96a3fb66ff726bf9ef6)