Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
commit974cf508fb5ba2ba3bd8fe7ae79710c9396d1d06
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)
treea6b6cf0d537015bc39f9a4831562da2b066b88cb
parentd46fc35dd4e22ecd777800a8cdb6c31763d0fac4
parent7d369906ec37caebaa4e2097874997fa257f1a31
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration