Merge pull request #374 from nolith/master
authorThomasV <thomasv1@gmx.de>
Sun, 10 Nov 2013 10:55:33 +0000 (02:55 -0800)
committerThomasV <thomasv1@gmx.de>
Sun, 10 Nov 2013 10:55:33 +0000 (02:55 -0800)
allow to connect to one server only

1  2 
electrum
lib/network.py

diff --cc electrum
Simple merge
diff --cc lib/network.py
Simple merge