Merge pull request #1587 from dersphere/fix_proxy
authorjmarshallnz <jcmarsha@gmail.com>
Thu, 11 Oct 2012 19:05:13 +0000 (12:05 -0700)
committerjmarshallnz <jcmarsha@gmail.com>
Thu, 11 Oct 2012 19:05:13 +0000 (12:05 -0700)
only use proxy if enabled AND server, port is not empty


Trivial merge