Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 15 Apr 2010 03:45:50 +0000 (13:45 +1000)
commit25cfa2aafd653c948430aae8729d293c86a6a68c
treed1c035801b117f2a504442026f930c994eb18eb5
parent4fb662bba6d96d4c04dadd9f908c4184ef4e969a
parent2a79d976f975ec1ecbd06c210cbb5e6a93068cec
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb