Merge branch 'master' of git://github.com/spesmilo/electrum

diff --git a/lib/bitcoin.py b/lib/bitcoin.py
index 28eb8d0..e3274cc 100644 (file)
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@@ -677,7 +677,7 @@ def bip32_private_key(sequence, k, chain):
 
 ################################## transactions
 
-MIN_RELAY_TX_FEE = 10000
+MIN_RELAY_TX_FEE = 1000