]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge branch 'v3-0-test' of ssh://jra@git.samba.org/data/git/samba into v3-0-test
authorJeremy Allison <jra@samba.org>
Mon, 24 Nov 2008 23:35:12 +0000 (15:35 -0800)
committerJeremy Allison <jra@samba.org>
Mon, 24 Nov 2008 23:35:12 +0000 (15:35 -0800)

Trivial merge