Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 14:12:58 +0000 (16:12 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 14:12:58 +0000 (16:12 +0200)
commit9586462b8f61f4e37b34f45e58293b143de63cb0
tree9eb36abddf6d19fd01e1f25d13a7e732055d1451
parenta58df2f54c5847a6a3dddad51465c319f1c387f5
parent228f342b1f12accbf3c07e1d2a1c9a5459ed966b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 18dd8120cc35fe3d1cd4455c1f6a32b503274d97)
testprogs/blackbox/test_wbinfo.sh