git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
71ca5d0
cf25dde
)
Merge commit 'origin/master'
author
Martin Schwenke
<martin@meltin.net>
Wed, 31 Mar 2010 06:52:42 +0000
(17:52 +1100)
committer
Martin Schwenke
<martin@meltin.net>
Wed, 31 Mar 2010 06:52:42 +0000
(17:52 +1100)
(This used to be ctdb commit
4fb662bba6d96d4c04dadd9f908c4184ef4e969a
)
Trivial merge