git.samba.org / kai / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 307cc31 c497e4b)
Merge remote branch 'martins/tests'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:34:02 +0000 (16:34 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:34:02 +0000 (16:34 +1100)
(This used to be ctdb commit 5f660e5bf321ae5332bf1d32c8af36d6cc2569f4)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.