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)
commit218a1c8a671ef84614b7b36bbb67ef4b3589c4dc
tree425c8e8fa733d8f39cb6531fea882521fee9011b
parentfc23663f4b830709b65e03185a78ed917970b2b5
parente4412a0470b18ea9e605f2afb00c23609102d59c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit eff27744d3dcb4f6bcdf9bd03583bb38634c398d)