Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Sep 2008 19:31:56 +0000 (21:31 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Sep 2008 19:31:56 +0000 (21:31 +0200)
commiteff27744d3dcb4f6bcdf9bd03583bb38634c398d
tree5a44f953dcdb8b5efd69bcc6689b767631b19c1f
parent696f30fff249656409f2efcc81b86a421d0c6880
parent53b57300c799a079b4d64815243fe6120e0a9fa2
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage