git://git.novaco.in / electrum-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1189cf8 2d743f3)
Merge branch '3M3RY-mainline_bitcoind'
authorThomasV <thomasv@gitorious>
Thu, 14 Nov 2013 11:27:59 +0000 (15:27 +0400)
committerThomasV <thomasv@gitorious>
Thu, 14 Nov 2013 11:27:59 +0000 (15:27 +0400)

Trivial merge
Electrum server