From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 24 Jul 2018 10:49:52 +0000 (+1200)
Subject: Merge pull request #12549 from civicrm/5.4
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=69e463c115157bdc19b5953082816cdad57c3d6b;p=civicrm-core.git

Merge pull request #12549 from civicrm/5.4

5.4
---

69e463c115157bdc19b5953082816cdad57c3d6b