From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 11 Sep 2018 21:03:52 +0000 (+1200)
Subject: Merge pull request #12801 from civicrm/5.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b875df23ab3acb2bdeaa774d052e71e0bfabcae7;p=civicrm-core.git

Merge pull request #12801 from civicrm/5.5

5.5
---

b875df23ab3acb2bdeaa774d052e71e0bfabcae7