Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
authorJelmer Vernooij <jelmer@samba.org>
Fri, 30 May 2008 10:18:07 +0000 (12:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 30 May 2008 10:18:07 +0000 (12:18 +0200)
commit7b0e0eb346c2f6a240b20fbcf14029539c6512b9
treea6671e178a8f7413f96ca69575b7658e483fac9f
parent2d1cac54dec1aed9e5258bd44bdd236b5dc92224
parent31308caad0a83a487341307e4e810a69c08ff371
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs

Conflicts:

source/samba4-skip
source/samba4-skip
source/selftest/samba4_tests.sh
source/torture/config.mk