Merge branch 'master' of gitorious.org:electrum/electrum
authorthomasv <thomasv@gitorious>
Wed, 2 May 2012 09:11:41 +0000 (11:11 +0200)
committerthomasv <thomasv@gitorious>
Wed, 2 May 2012 09:11:41 +0000 (11:11 +0200)
1  2 
gui_qt.py

diff --cc gui_qt.py
Simple merge