Merge remote branch 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 15 Mar 2012 05:09:41 +0000 (16:09 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 15 Mar 2012 05:09:41 +0000 (16:09 +1100)
1  2 
tools/ctdb.c

diff --cc tools/ctdb.c
Simple merge