git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e667345 2e056a7)
merged from peter
authorAndrew Tridgell <tridge@samba.org>
Wed, 20 Dec 2006 22:43:49 +0000 (09:43 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 20 Dec 2006 22:43:49 +0000 (09:43 +1100)
(This used to be ctdb commit e6fc75581e2038e98c730a6691a1cc61c5b83afe)


Trivial merge
Work in progress branches