Merge branch 'master' into qt-switch-gui
authorbkkcoins <chrissavery@gmail.com>
Sat, 5 Jan 2013 14:39:44 +0000 (21:39 +0700)
committerbkkcoins <chrissavery@gmail.com>
Sat, 5 Jan 2013 14:39:44 +0000 (21:39 +0700)
1  2 
lib/gui_qt.py

diff --cc lib/gui_qt.py
Simple merge