Merge branch '2.0'
authorThomasV <thomasv@gitorious>
Thu, 27 Feb 2014 09:41:22 +0000 (10:41 +0100)
committerThomasV <thomasv@gitorious>
Thu, 27 Feb 2014 09:41:22 +0000 (10:41 +0100)
commit7267579fe0792fc7ff65724d1756520d943bc66e
treeb5fbffdd3fb6ce92303d01a5a2580f78e45781e8
parentbb859c244b219479be2ea0980ff552bd9df362e4
parent638526712bc353b6e47d862df978f47e813e7df4
Merge branch '2.0'
gui/qt/installwizard.py
gui/qt/main_window.py
lib/wallet.py