From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 26 Nov 2015 22:55:23 +0000 (+1300)
Subject: Merge pull request #7289 from eileenmcnaughton/CRM-16929-partial
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=11830a97d02776f07d12a1a901c9ed0a6c2295f6;p=civicrm-core.git

Merge pull request #7289 from eileenmcnaughton/CRM-16929-partial

CRM-16929 partial fix for 500 error
---

11830a97d02776f07d12a1a901c9ed0a6c2295f6