Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
commitd022ed3eecbe4c3bd0c93ee09608c43048e6881a
authorAlexander Bokovoy <ab@samba.org>
Wed, 6 Feb 2008 05:58:20 +0000 (6 08:58 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 6 Feb 2008 05:58:20 +0000 (6 08:58 +0300)
treee1d22eead92455edbcccbd291694bf7354b83b5b
parentd3ee93596f574be2d0263efb92b2c38cf47a1a9d
parentb3f48266f353fb93fee35bdcadaec3abc0fe0122
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
(This used to be commit f59d3786abcc53065c838a2fa82ec2f4b577b16f)