Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorMartin Schwenke <martin@meltin.net>
Tue, 24 Aug 2010 01:53:29 +0000 (11:53 +1000)
committerMartin Schwenke <martin@meltin.net>
Tue, 24 Aug 2010 01:53:29 +0000 (11:53 +1000)
commitf2e2abbaad92e4648a8ffd8405f3707b6d4273ab
tree5c59819fc9cf1ea17a0c3009fb708755386bb0c9
parent4e9fe3545c6df86b33a3aad8a6fd119e79d6f078
parentccdb91a1693ba36c309dc2b69189bbc8f2673051
Merge branch 'master' of git://git.samba.org/sahlberg/ctdb

(This used to be ctdb commit 718ddc2264c28185fcddbc9cb0c7137d198a43a7)