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)
commit362057c7380dde732c9d64227092985579196ae6
treea086f15edd54bcb2086227a5efcc6fb50fe86888
parent30de518be9a173f9ec64c5e616ff3b6384a0418b
parentc7edba0990be451352c77cb6ca7431fdf907779d
Merge branch 'master' into qt-switch-gui
lib/gui_qt.py