Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Mon, 10 Mar 2014 15:05:57 +0000 (16:05 +0100)
committerThomasV <thomasv@gitorious>
Mon, 10 Mar 2014 15:05:57 +0000 (16:05 +0100)
1  2 
lib/wallet.py

diff --cc lib/wallet.py
Simple merge