From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 17 Feb 2016 19:16:45 +0000 (+1300)
Subject: Merge pull request #7687 from JMAConsulting/CRM-16259-2
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3bb129e80639f8ca86e03677156ac99cdc1dbdbd;p=civicrm-core.git

Merge pull request #7687 from JMAConsulting/CRM-16259-2

Crm 16259 2
---

3bb129e80639f8ca86e03677156ac99cdc1dbdbd