]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 5 Mar 2008 18:42:15 +0000 (19:42 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 5 Mar 2008 18:42:15 +0000 (19:42 +0100)

Trivial merge