From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 6 Feb 2018 04:38:27 +0000 (+1300)
Subject: Merge pull request #11635 from civicrm/4.7.30-rc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=239956f274f49c6153753191904531f4f21db939;p=civicrm-core.git

Merge pull request #11635 from civicrm/4.7.30-rc

4.7.30 rc merge to master
---

239956f274f49c6153753191904531f4f21db939