Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 03:06:37 +0000 (19:06 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 03:06:37 +0000 (19:06 -0800)
commit01afb07321a5af0fdd46fb30bda9419b553c1d5c
treed685c6a6dfd5674e9394f850ccad999330c7e97c
parent06f80cf8becc84672aad9d8703e1a2fbc80af20c
parent3d40b197b0312967c8d22af73f18414a9fe053bb
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 3a45f62310faf63cd6864d2cb10f941492eda818)
source3/client/client.c