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)
commit3c10a52ea1426b38cee53f7b693f653b68377d16
treecf66fad1281391567e831aad932339ab008edb09
parent361611611869dfe0206e87585c9802c08646a4fe
parentacca8d502b7c1f599eccac7c15934c6ea1563538
Merge branch 'used' of github.com:wozz/electrum into wozz-used
gui/qt/main_window.py