Merge remote branch 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 15 Mar 2012 05:09:41 +0000 (16:09 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 15 Mar 2012 05:09:41 +0000 (16:09 +1100)
commitb3ddf6901d1f4706731771606f466da4c6165fd9
tree3f401e8292705aba9273638ad97dd6b86e3a2ea2
parentf7b2adfde6e2fc225bcb9271dde5d73cfab656bf
parent88c74987dc90fa09bb8501f20a509c12480fba2e
Merge remote branch 'martins/master'

(This used to be ctdb commit af72f8bc05f78983f9624d81788f9d89af474b11)
ctdb/tools/ctdb.c