Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
commitf59d3786abcc53065c838a2fa82ec2f4b577b16f
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)
tree3882ae9ffc14a11184a87d8ea123e0bf4b347ad1
parent974cf508fb5ba2ba3bd8fe7ae79710c9396d1d06
parent7b15c75a6bacf783eb73568ed003e4b16d6ebd68
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration