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)
1  2 
gui/gui_classic.py

Simple merge