]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Mon, 4 Jun 2007 05:44:13 +0000 (15:44 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Mon, 4 Jun 2007 05:44:13 +0000 (15:44 +1000)
(This used to be ctdb commit 948b449748a126386f49ef9e763cfffd8b651516)

1  2 
ctdb/tools/ctdb_control.c

Simple merge