Merge branch 'socks-support' into merged
authorbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 08:14:48 +0000 (15:14 +0700)
committerbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 08:14:48 +0000 (15:14 +0700)
commit23b1ccaf394a8b4cc0c4e4fe07e9a735aa9d6de3
tree375eb897300b00c931cd4e423b18caca9bc8a698
parent43d9710cac7051bc1339222da3ec515307b05a62
parent2bf2f76a2a7318910db5bf4bd8c060dc17c18794
Merge branch 'socks-support' into merged
lib/gui_qt.py