]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Merge tridge's tree
authorVolker Lendecke <vl@samba.org>
Wed, 11 Apr 2007 14:52:06 +0000 (16:52 +0200)
committerVolker Lendecke <vl@samba.org>
Wed, 11 Apr 2007 14:52:06 +0000 (16:52 +0200)
(This used to be ctdb commit 63a59a700a1fb4c23cd76d99c5b4c9660c7ca475)


Trivial merge