Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
authorJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 17:02:01 +0000 (19:02 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 17:02:01 +0000 (19:02 +0200)
commiteb78b7c8742d5d7b223c58d66ecd87323ddbb5c1
tree738ea8138cc5bac0207251886164c997b2b1a85d
parent4e5e7a7c688d8a065994cb16fb1da7581bab081a
parent36c8725d43982f94f9e20b5b26d7e9e7587cfaf3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
(This used to be commit 2763fc6294aa35018d4317dd9eebcba969e70333)