Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Sat, 9 Nov 2013 07:15:51 +0000 (08:15 +0100)
committerThomasV <thomasv@gitorious>
Sat, 9 Nov 2013 07:15:51 +0000 (08:15 +0100)
1  2 
lib/wallet.py

diff --cc lib/wallet.py
Simple merge