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

Merge pull request #10593 from civicrm/4.7.21-rc

4.7.21 rc
---

4a5b9e772e80988ddd5a4af025a35f415f874418