From: Tim Otten <totten@civicrm.org>
Date: Sat, 8 Jul 2017 00:54:39 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/4.7.22-rc'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8541966620f7ed83bbef360d8375b6d5c4188228;p=civicrm-core.git

Merge remote-tracking branch 'origin/4.7.22-rc'
---

8541966620f7ed83bbef360d8375b6d5c4188228