Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
authorAlexander Bokovoy <ab@samba.org>
Wed, 30 Jan 2008 09:00:15 +0000 (12:00 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 30 Jan 2008 09:00:15 +0000 (12:00 +0300)
commit2763b90d242119d25d9f5afa91a403e85425da06
tree693290ff129af0f5dc0710a592e135ce1ae49932
parent77a3e46a4c5667e5a458e9931ed7129625a23d60
parentaf92bf934ed7614ab0aa41015e296924823a0a5f
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
(This used to be commit d841a3fc999c5ebd9e9d54b2bd5099b1b50402b1)