Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
commitd841a3fc999c5ebd9e9d54b2bd5099b1b50402b1
authorAlexander Bokovoy <ab@samba.org>
Wed, 30 Jan 2008 09:00:15 +0000 (30 12:00 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 30 Jan 2008 09:00:15 +0000 (30 12:00 +0300)
tree9f203bb77f6e15227e8ca5f8a08e61ab846ce08a
parent863b5ed07aca0978aeaf919d7c51204a95ce03e0
parent6bbe0fde6ebb5c1ea00ea24d3bdbffbf6f246bd6
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration