From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Mon, 3 Aug 2015 21:00:39 +0000 (+1200)
Subject: Merge pull request #6391 from eileenmcnaughton/CRM-16926
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=14e7e7e647bb05606ca00d2c913f27c74e2f55fb;p=civicrm-core.git

Merge pull request #6391 from eileenmcnaughton/CRM-16926

CRM-16926 fix up patch for 4.7
---

14e7e7e647bb05606ca00d2c913f27c74e2f55fb