Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:02:17 +0000 (16:02 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:02:17 +0000 (16:02 +0200)
commit1b084e85c1f5963d924f7764ae751f8cd8e57364
tree6e83ac48b817fe6b0775a09b026d21ac00a31c7a
parent2073346828ffa1d9c35105eadd7afddd3a76a045
parent21fcf7c419658b3ae296428ca7a4ccf2288c17fe
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange

Conflicts:

source/headermap.txt
source/headermap.txt
source/pidl/config.m4