Merge branch 'master' of git://github.com/spesmilo/electrum
authorecdsa <ecdsa@github>
Mon, 11 Mar 2013 19:30:25 +0000 (20:30 +0100)
committerecdsa <ecdsa@github>
Mon, 11 Mar 2013 19:30:25 +0000 (20:30 +0100)
1  2 
gui/gui_classic.py

Simple merge