From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun, 25 Jun 2017 22:30:19 +0000 (+1200)
Subject: Merge pull request #10559 from civicrm/4.7.21-rc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6688fac8fb94e70680e439f7f4c58bdb39b33570;p=civicrm-core.git

Merge pull request #10559 from civicrm/4.7.21-rc

4.7.21 rc
---

6688fac8fb94e70680e439f7f4c58bdb39b33570