Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into docstrings2
authorJelmer Vernooij <jelmer@samba.org>
Fri, 23 May 2008 13:20:57 +0000 (15:20 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 23 May 2008 13:20:57 +0000 (15:20 +0200)
commit1186579f94d81bc633b8f20e8ad8673313c8c39b
treefff2d454029e413304b5679b1c262e3e9e1b87bb
parent0b62a0875f01370f9db10c45253966f4fed74272
parent2f653e814a593e4581f28f8ed8158a84a591e9b4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into docstrings2
(This used to be commit 7ca46322f5aa650cfd89c4f887393da67ae9dc7b)