Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
authorAndrew Bartlett <abartlet@samba.org>
Sun, 16 Nov 2008 20:31:59 +0000 (07:31 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 16 Nov 2008 20:31:59 +0000 (07:31 +1100)
commit0d7995a5e832b8b89b0f7e5bb4232891e253ec5b
tree2bf50c8cd943a8a51c8430110902376ec62f0565
parent669cb093eae7324c5ab249e6cf2d6ba20074a160
parent1d9c88b3885728aba3d7fef85d80501125011f1c
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
lib/torture/torture.h
source4/dsdb/samdb/ldb_modules/config.mk
source4/torture/config.mk