]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
merge from ronnie
authorAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:30:19 +0000 (11:30 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 17 Apr 2007 01:30:19 +0000 (11:30 +1000)
(This used to be ctdb commit fcf3669c27691ddb383d1c585234622efa498d90)

1  2 
ctdb/common/ctdb_daemon.c

Simple merge