Merge remote branch 'martins/tests'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 18 Oct 2011 00:54:55 +0000 (11:54 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 18 Oct 2011 00:54:55 +0000 (11:54 +1100)
commit4dabd1fe05e78dcb36937cb49f2daa29ee452909
tree3c46ed29b848362e6bf8f40d98d284bad1426052
parent2e3febe283f5d6f24a2527d0e221eb46d1ca3c22
parent4b606fbb56d53c0050cf206e2c6b0f24b96483fc
Merge remote branch 'martins/tests'

(This used to be ctdb commit 99de5bceb788ba56ebc052c05d29a834ba2496fa)