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 29848e64a2c6d86c0ac0ac73d4cd3c1b4a07e254
DIR parent ca75d3c08a2dd358967eacbacbfbb89ac3d504f9
HTML Author: thomasv <thomasv@gitorious>
Date: Mon, 7 Oct 2013 19:24:26 +0200
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
M lib/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/lib/__init__.py b/lib/__init__.py
t@@ -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