Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
commit8e201ecf3e86c3c8865c7276fad8dad07106efaf
authorJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 19:36:49 +0000 (1 21:36 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 19:36:49 +0000 (1 21:36 +0200)
tree658e2244d0bd11831524b43d4373f940758e8cc0
parentbe75b2a36ee49f66ada3ec3ababa82d74085d559
parent66b76b018d6048cec63a75b24ec4c099f6a2eb8c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage