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)
commitf352832879434ad61cf8e337ae1488aa4dd1f2dd
treeba572c28936068c57a4eef349d08e0d042bedf8c
parent6ecb9774619f871e41ecc1183a4528bcafc1f0a1
parent5053f97dc218b74e2d3f66123104779d8fc6827d
Merge branch 'master' of git://github.com/spesmilo/electrum
lib/wallet.py