Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
authorJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 19:36:49 +0000 (21:36 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 19:36:49 +0000 (21:36 +0200)
commitb1f85bfb005c4f6c93cf88779e3a12abbd99c973
tree404dc0a9a298e7ef6a3f3e68f1b937b0dead1894
parent47124efe420f4f4f08494cbb2255eacdc9625c8d
parentd9ad17f945d21d50ea629e22db3ee8758be421a6
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit 8e201ecf3e86c3c8865c7276fad8dad07106efaf)