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)
commitc533b797e0d2d976da3ee1ab1afb7f5562f5747b
treef5cd4e9f4bd8e6fe75e98433ae4cc8f2a07661cc
parenta3830e5903fb11319fdd4397bb94fae1ff71b76c
parent2984c3dd95d3eadeaf92e000259c4d6b211ad8be
Merge branch 'master' of gitorious.org:electrum/electrum
lib/wallet.py