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)
1  2 
lib/torture/torture.h
source4/dsdb/samdb/ldb_modules/config.mk
source4/torture/config.mk

Simple merge
Simple merge