Merge pull request #8245 from colemanw/CRM-18006-b
authorTim Otten <totten@civicrm.org>
Wed, 27 Apr 2016 01:15:22 +0000 (18:15 -0700)
committerTim Otten <totten@civicrm.org>
Wed, 27 Apr 2016 01:15:22 +0000 (18:15 -0700)
commit8f2769670cf7267f568fb1b7cf1929529178674c
treeda103c4b2eb7fada3fa72fc68692e31d39ad5ddd
parente15414438a11e259c3353fb4afe4a5eb363dfc0e
parent2af0b023b1f25c8e0418d7b0fb8076f7fe1a866d
Merge pull request #8245 from colemanw/CRM-18006-b

Last-minute upgrade fixes