From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 8 Jan 2016 08:54:08 +0000 (+1300)
Subject: Merge pull request #7558 from eileenmcnaughton/CRM-17028
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a54caf48cabb264eda52671cd02484d3e101dcc9;p=civicrm-core.git

Merge pull request #7558 from eileenmcnaughton/CRM-17028

Crm 17028
---

a54caf48cabb264eda52671cd02484d3e101dcc9