Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
authorJelmer Vernooij <jelmer@samba.org>
Sun, 27 Jul 2008 17:57:27 +0000 (19:57 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 27 Jul 2008 17:57:27 +0000 (19:57 +0200)
commit72d2bea916c19405f4fa996b7f781d73e3ee87c8
tree3814912a6d73a09163152e56a0bc05288302dea2
parent8d8ccc57e986d758a285a6af256ab945ccdac4dc
parent55ea54ec640e4a76df397becc211a81aaec6f09d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit 7e90cc197c4fb2884f368cd72f391d0d8016fb96)