Merge commit 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 30 Aug 2010 08:22:05 +0000 (18:22 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 30 Aug 2010 08:22:05 +0000 (18:22 +1000)
commit2b4d9170c28eccf396debaae699c660f56c37760
treea3f2c5afab5657c5944669c0697f1200838b817a
parent92455c3dff5ff4e92f804f8f17500c7b1d1eeed5
parent46b9110f88137a9cffdf2c098a39ee25226c62fe
Merge commit 'martins/master'

(This used to be ctdb commit cc8c851e2e0b46f00b18a6dc61fd2774e97850dd)
ctdb/config/events.d/60.nfs