Merge branch 'mainline_bitcoind' of github.com:luke-jr/electrum-server into mainline_...
authorEmery Hemingway <emery@fuzzlabs.org>
Thu, 7 Nov 2013 20:14:21 +0000 (15:14 -0500)
committerEmery Hemingway <emery@fuzzlabs.org>
Thu, 7 Nov 2013 20:14:21 +0000 (15:14 -0500)
commit6504ac96768449288ac347c62005d6a911d93f69
tree726875c10182f62e2c6acaf0c52a37a097dee0a1
parent4a82994032a48db0fc4be814091215c69891ab17
parent9ef61e849b689da9c90ddfcee796a370fd1d12eb
Merge branch 'mainline_bitcoind' of github.com:luke-jr/electrum-server into mainline_bitcoind
backends/abe/__init__.py
backends/bitcoind/blockchain_processor.py