git://git.novaco.in
/
electrum-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4ba89c7
fe7a0e0
)
Merge remote-tracking branch 'upstream/master'
author
Eagle[TM]
<eagletm@mpex.net>
Mon, 26 Nov 2012 22:20:31 +0000 (23:20 +0100)
committer
Eagle[TM]
<eagletm@mpex.net>
Mon, 26 Nov 2012 22:20:31 +0000 (23:20 +0100)
Trivial merge