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)
commit3eb6f79a02de6820581b91f8d9be80b8dd620119
tree3567dccbd6e247f72fe079e4592f0084b1ac0059
parentdadd59ba401943d0cf5e4d07959456b70a3c11d9
parent1efff73068e933dd0b4cc81ff901f6010fda9a6b
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into trusted-domains
(This used to be commit a057c3ed9df2670e5cad5f1807e280d77eb58cb0)