Merge pull request #175 from Christian-G/master
authorSteve Bazyl <sqrrrl@gmail.com>
Sat, 6 Dec 2014 00:50:25 +0000 (16:50 -0800)
committerSteve Bazyl <sqrrrl@gmail.com>
Sat, 6 Dec 2014 00:50:25 +0000 (16:50 -0800)
Added HTTP Proxy support


Trivial merge