Merge branch 'socks-support' into merged
authorbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 06:22:55 +0000 (13:22 +0700)
committerbkkcoins <chrissavery@gmail.com>
Fri, 21 Sep 2012 06:22:55 +0000 (13:22 +0700)

Trivial merge