Merge pull request #9910 from seamuslee001/CRM-19835
authorTim Otten <totten@civicrm.org>
Mon, 13 Mar 2017 22:11:03 +0000 (15:11 -0700)
committerGitHub <noreply@github.com>
Mon, 13 Mar 2017 22:11:03 +0000 (15:11 -0700)
commit9c874be15da6e0c8d378330b8f0a72de5ff42321
treeac32864efb61c3478eb96ed923cbf60d42d6987a
parente504119e4f6e9aab9809cbb04e041f26c4b3e7bf
parent3916ca43a5beed801d4e12c705b7562be7d292f7
Merge pull request #9910 from seamuslee001/CRM-19835

CRM-19835 Use host rather than server and put in port if supplied