git.samba.org / obnox / samba / samba-obnox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a86d6e 926a6d7)
Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 20 Jul 2011 05:53:11 +0000 (15:53 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 20 Jul 2011 05:53:11 +0000 (15:53 +1000)
(This used to be ctdb commit a1b3661973489f0111e7975fec422fb99a25f0c8)


Trivial merge
Michael's Samba GIT