Merge remote-tracking branch 'origin/4.7.22-rc'
authorTim Otten <totten@civicrm.org>
Sat, 8 Jul 2017 00:54:39 +0000 (17:54 -0700)
committerTim Otten <totten@civicrm.org>
Sat, 8 Jul 2017 00:54:39 +0000 (17:54 -0700)
commit8541966620f7ed83bbef360d8375b6d5c4188228
tree7ad966b4b1455453d751dcaa6c0430bb932a874e
parentc89a36e49a8514f97ecd2417ec1f972cdddec29f
parent0778420a772e6e265c89ffe6c841cd08abf2db41
Merge remote-tracking branch 'origin/4.7.22-rc'