Merge branch 'master' of gitorious.org:electrum/electrum
authorJulian Tosh <Julian@Tosh.us>
Sat, 7 Jul 2012 13:41:16 +0000 (06:41 -0700)
committerJulian Tosh <Julian@Tosh.us>
Sat, 7 Jul 2012 13:41:16 +0000 (06:41 -0700)
1  2 
lib/wallet.py

diff --cc lib/wallet.py
Simple merge