Merge branch 'openchange' of /home/jelmer/samba4 into upstream
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:08:20 +0000 (16:08 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 14:08:20 +0000 (16:08 +0200)
commita9f0a672f2c32bfbe1ec931ed37f8dfcc525b4dc
tree13bb3f7ed75df2acaf511ee05ee98ffb30acf056
parent7dec04b52bef9686ea18295a6b3f1729dc3c6ec1
parent7fccd85cc673c139bc1d57915e0fccd22316998c
Merge branch 'openchange' of /home/jelmer/samba4 into upstream