Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
commitd3ee93596f574be2d0263efb92b2c38cf47a1a9d
authorAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:44:57 +0000 (31 16:44 +0300)
committerAlexander Bokovoy <ab@samba.org>
Thu, 31 Jan 2008 13:44:57 +0000 (31 16:44 +0300)
treef8c85be24197a87f2b8a7dbdb9392bbb81260dd7
parent4259d115478750d7b38cd6c2f20777b27f017e69
parent8d8d955b98039d48e1aca6396bbdbc11d9141c21
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
(This used to be commit 974cf508fb5ba2ba3bd8fe7ae79710c9396d1d06)