]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
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)
Conflicts:

source/samba4-skip

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

Simple merge
Simple merge
Simple merge