Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Fri, 5 Feb 2010 03:00:23 +0000 (14:00 +1100)
committerMartin Schwenke <martin@meltin.net>
Fri, 5 Feb 2010 03:00:23 +0000 (14:00 +1100)
commit240625fe9d4f6d1176d17f942a96fd06051e90c1
tree4cf192147473b0fe9bff4786a5226a70be1b959b
parent56b178e1a2109a2dca52e2140db060bd091b1458
parentf23b82b58c1cdcbfa9d2631dd7513e4fe3e2538b
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb

(This used to be ctdb commit a442668923d4d8f8d624e00138fe37d76d593d21)