git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78a0203 d3e24f7)
Merge commit 'ronnie-ctdb/master' into tridge
authorAndrew Tridgell <tridge@samba.org>
Wed, 14 May 2008 04:37:11 +0000 (14:37 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 14 May 2008 04:37:11 +0000 (14:37 +1000)
(This used to be ctdb commit b616961c16667328a81efa00a1c880efa4e791f1)


Trivial merge
Samba Shared Repository