Merge branch '4.7.18-rc' of https://github.com/civicrm/civicrm-core
authoreileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 06:55:44 +0000 (19:55 +1300)
committereileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 06:55:44 +0000 (19:55 +1300)
commitc1b37365f193c64ff47717ac9150c8685b44a973
treeb4441a1c898c31cf6968e2c220142d603d72c491
parent34701226786f67c455cbbea360d40c8d74c25cba
parent734528f8433926c69350647ea761269be89866bc
Merge branch '4.7.18-rc' of https://github.com/civicrm/civicrm-core