From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 4 Jul 2017 04:43:20 +0000 (+1200)
Subject: Merge pull request #10600 from civicrm/4.7.21-rc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a1c77a65764fb8c6b5af88096357eebb3873493f;p=civicrm-core.git

Merge pull request #10600 from civicrm/4.7.21-rc

4.7.21 rc
---

a1c77a65764fb8c6b5af88096357eebb3873493f