From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun, 3 Sep 2017 21:42:37 +0000 (+1200)
Subject: Merge pull request #8724 from JMAConsulting/CRM-18231
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f7a4b13301980d2fe58da152bb110688b59b9651;p=civicrm-core.git

Merge pull request #8724 from JMAConsulting/CRM-18231

CRM-18231 Environment variables
---

f7a4b13301980d2fe58da152bb110688b59b9651