git.samba.org / obnox / samba / samba-obnox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3dbc3f f844ca7)
Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Tue, 16 Dec 2008 00:21:55 +0000 (11:21 +1100)
committerMartin Schwenke <martin@meltin.net>
Tue, 16 Dec 2008 00:21:55 +0000 (11:21 +1100)
(This used to be ctdb commit da61a9822f66ff227b8859bf15ba76fd9afb9d12)


Trivial merge
Michael's Samba GIT