From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 7 Sep 2018 07:21:04 +0000 (+1200)
Subject: Merge pull request #12792 from civicrm/5.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bdf6f906cbf154f72d078d3fa490510f2a68aea4;p=civicrm-core.git

Merge pull request #12792 from civicrm/5.5

5.5
---

bdf6f906cbf154f72d078d3fa490510f2a68aea4