Merge remote branch 'martins/eventscript_tests'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 15 Aug 2011 05:43:15 +0000 (15:43 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 15 Aug 2011 05:43:15 +0000 (15:43 +1000)
commit569ea5c4e19207905e38a96743567e304709ef60
treec20cf00e4978477d8e00d3752b097aa0365a3519
parent1fb577f4b2fd842867b275514b6185aa3b45805d
parent65ff8b4b7b707f288d8bfef979553394dad749db
Merge remote branch 'martins/eventscript_tests'

(This used to be ctdb commit 4e670d9bc1bdeb2abd7e846bc36e02f0aa0d7309)