From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon, 29 Feb 2016 02:12:29 +0000 (+1300)
Subject: Merge pull request #7879 from eileenmcnaughton/CRM-18109
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4088da9abb90d14e4f95939b2bea54b183128dee;p=civicrm-core.git

Merge pull request #7879 from eileenmcnaughton/CRM-18109

CRM-18109 fix to earlier commit on this issue
---

4088da9abb90d14e4f95939b2bea54b183128dee