Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 02:07:20 +0000 (12:07 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 02:07:20 +0000 (12:07 +1000)
(This used to be commit ecb0e5477aa63180daade5c597e7ac2aebfc1e15)

1  2 
source4/torture/gentest.c
source4/torture/gentest_smb2.c

Simple merge
Simple merge