Merge pull request #7412 from colemanw/UpgradeCleanup
authorcolemanw <coleman@civicrm.org>
Tue, 8 Dec 2015 17:22:06 +0000 (12:22 -0500)
committercolemanw <coleman@civicrm.org>
Tue, 8 Dec 2015 17:22:06 +0000 (12:22 -0500)
Upgrade cleanup


Trivial merge