Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
commit4259d115478750d7b38cd6c2f20777b27f017e69
authorAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:08:57 +0000 (31 16:08 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:08:57 +0000 (31 16:08 +0300)
tree289563bcfe29c2892c1b77aa95292530b7e3c69a
parent2763b90d242119d25d9f5afa91a403e85425da06
parent09454362cf75ecb7db58560604b567611e89d5ef
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
(This used to be commit d46fc35dd4e22ecd777800a8cdb6c31763d0fac4)