Merge pull request #6475 from colemanw/CRM-16806
authorcolemanw <coleman@civicrm.org>
Wed, 12 Aug 2015 01:38:23 +0000 (21:38 -0400)
committercolemanw <coleman@civicrm.org>
Wed, 12 Aug 2015 01:38:23 +0000 (21:38 -0400)
CRM-16806 - Additional cleanup


Trivial merge