tMerge commit 'refs/merge-requests/5' of git://gitorious.org/electrum/electrum into merge-requests/5a - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit ec9118da42250945cef759767a557a3a1ddaaa57
 (DIR) parent 2a08145faf0e93a3d13b79c92dd285950974fa59
 (HTM) Author: ThomasV <thomasv@gitorious>
       Date:   Sun, 19 Feb 2012 23:11:50 +0300
       
       Merge commit 'refs/merge-requests/5' of git://gitorious.org/electrum/electrum into merge-requests/5a
       
       Diffstat:
         M client/electrum                     |       5 ++---
       
       1 file changed, 2 insertions(+), 3 deletions(-)
       ---
 (DIR) diff --git a/client/electrum b/client/electrum
       t@@ -109,15 +109,14 @@ if __name__ == '__main__':
                host = raw_input("server (default:%s):"%interface.host)
                port = raw_input("port (default:%d):"%interface.port)
                fee = raw_input("fee (default:%s):"%( str(Decimal(wallet.fee)/100000000)) )
       +        gap = raw_input("gap limit (default 5):")
                if fee: wallet.fee = float(fee)
                if host: interface.host = host
                if port: interface.port = int(port)
       +        if gap: wallet.gap_limit = int(gap)
                seed = raw_input("if you are restoring an existing wallet, enter the seed. otherwise just press enter: ")
       -        wallet.gap_limit = 5
                if seed:
                    wallet.seed = seed
       -            gap = raw_input("gap limit (default 5):")
       -            if gap: wallet.gap_limit = int(gap)
                    print "recovering wallet..."
                    wallet.synchronize()
                    if wallet.is_found():