Merge branch 'openchange' of /home/jelmer/samba4
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:07:24 +0000 (16:07 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:07:24 +0000 (16:07 +0200)
commita53198d24a4e026fa26b9f9d9d2bd9b9fc9ea79c
treec3a801d41631ca080ec27a0081e0a14b05b54baf
parent5869047f7f0ab003b22de8dc68c3a8d42b485ff7
parent7fccd85cc673c139bc1d57915e0fccd22316998c
Merge branch 'openchange' of /home/jelmer/samba4