Merge branch 'master' of git://github.com/spesmilo/electrum
authorThomasV <thomasv@gitorious>
Fri, 25 Apr 2014 08:16:11 +0000 (10:16 +0200)
committerThomasV <thomasv@gitorious>
Fri, 25 Apr 2014 08:16:11 +0000 (10:16 +0200)
1  2 
gui/qt/main_window.py

Simple merge