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)
commit18dd8120cc35fe3d1cd4455c1f6a32b503274d97
tree4f9ef9e91eb7935cad716cbc1c032476a9c23539
parentdf05f118831245bdb19573711545bdb1b01a0c50
parent49367e044e3ab94639ab3209bfd06c6286b44b59
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
testprogs/blackbox/test_wbinfo.sh