Merge pull request #6300 from colemanw/CRM-16860
authorcolemanw <coleman@civicrm.org>
Sat, 25 Jul 2015 19:14:51 +0000 (15:14 -0400)
committercolemanw <coleman@civicrm.org>
Sat, 25 Jul 2015 19:14:51 +0000 (15:14 -0400)
CRM-16860 - Upgrade code refactor/cleanup


Trivial merge