Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
authorJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 12:33:56 +0000 (14:33 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 12:33:56 +0000 (14:33 +0200)
commitb17484a70f50d3cc2b1031e86dfe080b9f48181d
tree092468b7c2ad20071f409ae79dca4972d707578a
parentcaaa8f5b93b12111d04b7ebc82b65cb0cfe404c6
parent67bf4bab3ddaf8d1dfaee92007700d8f05a1c191
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
(This used to be commit 8c3591d98f42a75d68d698f7b4be8f2e0284522f)