Merge branch 'used' of github.com:wozz/electrum into wozz-used
authorthomasv <thomasv@gitorious>
Fri, 22 Nov 2013 12:36:02 +0000 (13:36 +0100)
committerthomasv <thomasv@gitorious>
Fri, 22 Nov 2013 12:36:02 +0000 (13:36 +0100)
1  2 
gui/qt/main_window.py

Simple merge