Merge branch '4.7.21-rc' into master
authorColeman Watts <coleman@civicrm.org>
Wed, 21 Jun 2017 19:11:31 +0000 (15:11 -0400)
committerColeman Watts <coleman@civicrm.org>
Wed, 21 Jun 2017 19:11:31 +0000 (15:11 -0400)
commitc0afaa3afad5c0b5aa4f06be9b6bd64316420740
tree7247b9e1394cec98536bf5a3f322fd83c1ee1221
parent54ed6b8915fe914aa4bc9452f0b6d0529fc5b06e
parentb132aadd969a00ad06b7058ac86251923f0a8c65
Merge branch '4.7.21-rc' into master