From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 11 Jul 2018 00:20:53 +0000 (+1200)
Subject: Merge pull request #12448 from civicrm/5.4
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2fd888a5bcee039dea470cfa6bed1cfacb7444f6;p=civicrm-core.git

Merge pull request #12448 from civicrm/5.4

5.4
---

2fd888a5bcee039dea470cfa6bed1cfacb7444f6