From: Jeremy Allison Date: Fri, 11 Jan 2008 00:36:05 +0000 (-0800) Subject: Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test X-Git-Tag: samba-4.0.0alpha6~801^2~3901 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57;p=samba.git Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test (This used to be commit 767e0164adf8803df50b0b7bd8e81d25af72bb78) --- 6a8fad084cda2b68ced5aaa8c6ef6a03c7350c57