From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 28 Nov 2017 03:21:51 +0000 (+1300)
Subject: Merge pull request #11335 from civicrm/4.7.28-rc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1f54552391794d7ce5e422d6d90d55c63ca537a3;p=civicrm-core.git

Merge pull request #11335 from civicrm/4.7.28-rc

Merge from rc
---

1f54552391794d7ce5e422d6d90d55c63ca537a3