git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d595f41 ff59bb3)
Merge commit 'origin/status-test' into status-test
authorMartin Schwenke <martin@meltin.net>
Tue, 24 Nov 2009 05:14:54 +0000 (16:14 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 24 Nov 2009 05:14:54 +0000 (16:14 +1100)
(This used to be ctdb commit 2e60749de3714239224cc04170a9aeeee158153f)


Trivial merge
Samba Shared Repository