Merge pull request #7488 from totten/master-upgrade-misc
authorTim Otten <totten@civicrm.org>
Tue, 22 Dec 2015 01:20:22 +0000 (17:20 -0800)
committerTim Otten <totten@civicrm.org>
Tue, 22 Dec 2015 01:20:22 +0000 (17:20 -0800)
Upgrades/Settings - Fix problems upgrading from older releases


Trivial merge