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)
commit2763fc6294aa35018d4317dd9eebcba969e70333
tree3ba4137dde64dffcf2df589b4a1c4495af9e38e3
parent0e371cf169e9a607fcbb3e65437ab9413935dd52
parentd777a83b8478bf09a45eccde38036eccbd219df8
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange