]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from tridge
authorRonnie Sahlberg <sahlberg@ronnie>
Tue, 15 May 2007 00:28:41 +0000 (10:28 +1000)
committerRonnie Sahlberg <sahlberg@ronnie>
Tue, 15 May 2007 00:28:41 +0000 (10:28 +1000)
(This used to be ctdb commit 0697f59a044deeab126a39bff97bcd5c1101298e)

1  2 
ctdb/include/ctdb.h

Simple merge