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

2013-10-07 19:24:26 +02:00 · 2013-10-07 19:24:26 +02:00 · 29848e64a2
parent ca75d3c08a 37e7759206
commit 29848e64a2
1 changed files with 1 additions and 1 deletions
--- a/lib/init.py
+++ b/lib/init.py
@ -3,7 +3,7 @@ from util import format_satoshis, print_msg, print_json, print_error, set_verbos
 from wallet import WalletSynchronizer, WalletStorage
 from wallet_factory import WalletFactory as Wallet
 from verifier import TxVerifier
-from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS
+from network import Network, DEFAULT_SERVERS, DEFAULT_PORTS, pick_random_server
 from interface import Interface
 from simple_config import SimpleConfig
 import bitcoin