Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 19 Feb 2008 03:45:23 +0000 (14:45 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 19 Feb 2008 03:45:23 +0000 (14:45 +1100)
commite51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1
tree643566bbcf1312cd9ae1fed9e235d702c7281a8f
parent5842df9d0fb71430d1bcda1c4c748589b38ecb00
parent9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)
source4/torture/config.mk