Merge branch 'master' of git://git.samba.org/sahlberg/ctdb
authorAndrew Tridgell <tridge@samba.org>
Thu, 8 May 2008 06:58:34 +0000 (16:58 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 8 May 2008 06:58:34 +0000 (16:58 +1000)
1  2 
tools/ctdb.c

diff --cc tools/ctdb.c
Simple merge