From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 6 Jul 2018 07:28:41 +0000 (+1200)
Subject: Merge pull request #12428 from civicrm/5.4
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ed2c816379a9506288198d5c446cb0703b338841;p=civicrm-core.git

Merge pull request #12428 from civicrm/5.4

5.4
---

ed2c816379a9506288198d5c446cb0703b338841