bitcoin/bitcoin — pull request #3452 by Diapolo (2013-12-20 17:56:34+00:00)
Title: [Qt] make paymentserver code query core for proxy

- as a proxy set via GUI can be overridden via -proxy, directly query the
core to get active proxy
- small includes cleanup for paymentserver.cpp