Merge branch '4.7.21-rc' into master
authorColeman Watts <coleman@civicrm.org>
Sat, 1 Jul 2017 18:23:02 +0000 (14:23 -0400)
committerColeman Watts <coleman@civicrm.org>
Sat, 1 Jul 2017 18:23:02 +0000 (14:23 -0400)
commit8ba7d4c0db7d3280eec88d6e367f3f07ca2f9e25
treea3b63add8bba1bc726e18c8c0e0c9722a1e3b4b0
parentf8ff6f87ba5f104e37be1f248c887db1af6fdb99
parent63d18d06f143d9d606df94e3a31138c33848c242
Merge branch '4.7.21-rc' into master