Merge branch 'openchange' of /home/jelmer/samba4 into upstream
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 15:32:05 +0000 (17:32 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 15:32:05 +0000 (17:32 +0200)
commit16caef39fef424aa13bd17f7a98fd95e3d656413
treeb7b7e19dca957b290371b74603c79b0f3a51fb53
parent8fa2ec161137784530de942c05aad11a9ac8da67
parentc96a68b7b7792d30b7b1a0167a0cbf6fe285993c
Merge branch 'openchange' of /home/jelmer/samba4 into upstream