Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
authorAndrew Bartlett <abartlet@samba.org>
Mon, 8 Sep 2008 02:54:13 +0000 (12:54 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 8 Sep 2008 02:54:13 +0000 (12:54 +1000)
commita057c3ed9df2670e5cad5f1807e280d77eb58cb0
treece4b4e5b5300b6e3d236ffaf3b51cf03f92c7881
parent07cb8db799cc22685af4bb63285fa10115790ce1
parent1432a96d37e367d9d97d48b69c6f16351a9ad066
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains