git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bcad72 c7c1939)
Merge remote branch 'martins/takeover'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:30:49 +0000 (16:30 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 6 Feb 2012 05:30:49 +0000 (16:30 +1100)
(This used to be ctdb commit 4948f34676d5bdaaf1ddf8879df618a76013ea1e)


Trivial merge
Samba Shared Repository