From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 3 Sep 2015 08:20:33 +0000 (+1200)
Subject: Merge pull request #6658 from eileenmcnaughton/CRM-17120
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=011e7281e4aeb09d637ae1ae13c3e1a6c05d6111;p=civicrm-core.git

Merge pull request #6658 from eileenmcnaughton/CRM-17120

Crm 17120
---

011e7281e4aeb09d637ae1ae13c3e1a6c05d6111