Merge branch 'wbinfo-test' of git://git.samba.org/kai/samba/kai-work-in-progress...
authorJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 22:05:36 +0000 (00:05 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 15 Apr 2008 22:05:36 +0000 (00:05 +0200)
commitf5c0be9208b7b59b1452caedd47204030c43a02d
tree65770a30ecb87a9b1260b49e1616624ddfd15da4
parentedc9b35f1e50f73684dcb5c971ad38453239e5a2
parent3413cfefb836c6a24fa740c13817a65fe264f2da
Merge branch 'wbinfo-test' of git://git.samba.org/kai/samba/kai-work-in-progress into v4-0-selftest
(This used to be commit 56340a5fa1b075001bba829686861a59406e1f5d)