Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Tue, 12 Mar 2013 18:24:55 +0000 (19:24 +0100)
committerecdsa <ecdsa@github>
Tue, 12 Mar 2013 18:24:55 +0000 (19:24 +0100)
commit4f27d8ce0f4c0254891b2dbf3b34dfad61ae2746
tree04e4db6d062bbd4b4eca01e01979f544bb4fbeb6
parent136f2cefcbae1024d8ee0433d5fe6c363de2935a
parent2c1ae1ba18b04ef3a98176f29f4a1c887abdbed3
Merge branch 'master' of git://github.com/spesmilo/electrum
gui/gui_classic.py