Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 12 May 2011 08:58:07 +0000 (18:58 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 12 May 2011 08:58:07 +0000 (18:58 +1000)
commit588905c5af1f361cb655902f346da92f36680256
treef53565fdb878891a154cad6770d32d12ef12a413
parentd020b2c9500aed322cafd8097b0a2df69028fc28
parent4ff1654f296d564e85261f044c3db5b1ecead0d1
Merge branch 'master' of ssh://git.samba.org/data/git/ctdb

(This used to be ctdb commit 307e915459c26a728a1ec16bd735d983d493df53)