]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge commit 'origin/v4-0-test' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (18:39 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (18:39 +1000)

Trivial merge