git.samba.org / tprouty / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 587a2db 0247415)
Merge branch 'ctdb-merge' into v3-2-test
authorAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 15:53:16 +0000 (18:53 +0300)
committerAlexander Bokovoy <ab@samba.org>
Wed, 16 Jan 2008 15:53:16 +0000 (18:53 +0300)
(This used to be commit 175662b5bbb5c8ecd81a60539f5846a938c26a3a)


Trivial merge
My public samba repository