Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
authorJelmer Vernooij <jelmer@samba.org>
Tue, 22 Jan 2008 15:39:56 +0000 (16:39 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 22 Jan 2008 15:39:56 +0000 (16:39 +0100)
commit4075a2ba982ea56ff925e0a33839f0760fd71911
tree87d87734257f814b7960a843e54455c447f34a9e
parent24da29746998de1001d18871dcbe8d37643667d5
parent35c68316442808a135aafa864d19592108a4d879
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
(This used to be commit 2f57e25f8f692889d9e057e13256f8a24c5ec10c)
source4/scripting/python/config.m4
source4/selftest/target/Samba4.pm