Merge branch 'mainline_bitcoind' of github.com:luke-jr/electrum-server into mainline_...

diff --cc backends/abe/__init__.py
Simple merge

diff --cc backends/bitcoind/blockchain_processor.py
index 538478d,6fb36fb..cd169af
--- 1/backends/bitcoind/blockchain_processor.py
--- 2/backends/bitcoind/blockchain_processor.py
+++ b/backends/bitcoind/blockchain_processor.py
@@@ -762,11 -614,10 +762,10 @@@ class BlockchainProcessor(Processor)
          elif method == 'blockchain.transaction.get':
              try:
                  tx_hash = params[0]
-                 height = params[1]
-                 result = self.bitcoind('getrawtransaction', [tx_hash, 0, height])
+                 result = self.bitcoind('getrawtransaction', [tx_hash, 0])
              except BaseException, e:
 -                error = str(e) + ': ' + tx_hash
 -                print_log("error:", error)
 +                error = str(e) + ': ' + repr(params)
 +                print_log("tx get error:", error)
  
          else:
              error = "unknown method:%s" % method