Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 5 Sep 2011 06:42:49 +0000 (16:42 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 5 Sep 2011 06:42:49 +0000 (16:42 +1000)
commit2e5b0f1eb27fddfb5cdd0a705ad0057eb5f29292
treebe6f10cc1f2aa3396568e4c426802c89425ec616
parenta3e007956864f5d902f7bec22a2c51d1c391a7ff
parenta74f35227151f9b7893350e24189a2c01c04fc31
Merge branch 'master' of ssh://git.samba.org/data/git/ctdb

(This used to be ctdb commit 32320ee278d1eec9aef18b400c0ddaa445d4211e)