From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 27 May 2016 05:35:56 +0000 (+1200)
Subject: Merge pull request #8462 from eileenmcnaughton/hack
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a05198e127eb14c6d9582e343a21f769a2a144eb;p=civicrm-core.git

Merge pull request #8462 from eileenmcnaughton/hack

 CRM-18684 fix fatal error by backporting 4.7 hack
---

a05198e127eb14c6d9582e343a21f769a2a144eb