Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Mon, 30 Sep 2013 15:43:33 +0000 (17:43 +0200)
committerThomasV <thomasv@gitorious>
Mon, 30 Sep 2013 15:43:33 +0000 (17:43 +0200)
1  2 
gui/qt/installwizard.py

Simple merge