Merge pull request #7388 from totten/4.6-cxn-proxy
authorTim Otten <totten@civicrm.org>
Mon, 7 Dec 2015 03:38:06 +0000 (19:38 -0800)
committerTim Otten <totten@civicrm.org>
Mon, 7 Dec 2015 03:38:06 +0000 (19:38 -0800)
CiviConnect - Proxy support; UI tweaks; System.get improvements


Trivial merge