]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Wed, 13 Feb 2008 01:56:02 +0000 (17:56 -0800)
committerJeremy Allison <jra@samba.org>
Wed, 13 Feb 2008 01:56:02 +0000 (17:56 -0800)

Trivial merge