git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce1fe07 d0656da)
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)
(This used to be ctdb commit 25cfa2aafd653c948430aae8729d293c86a6a68c)


Trivial merge
Work in progress branches