tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 3e1a87397d3bdf056d0b45744673e2cfd083c02c DIR parent 8a7a6f347beff3a66af845a54e74a670f1f573c0 HTML Author: ThomasV <thomasv@gitorious> Date: Thu, 17 Apr 2014 17:05:45 +0200 Merge branch 'master' of git://github.com/spesmilo/electrum Diffstat: M lib/bitcoin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- DIR diff --git a/lib/bitcoin.py b/lib/bitcoin.py t@@ -677,7 +677,7 @@ def bip32_private_key(sequence, k, chain): ################################## transactions -MIN_RELAY_TX_FEE = 10000 +MIN_RELAY_TX_FEE = 1000