Merge pull request #6196 from eileenmcnaughton/master
authorcolemanw <coleman@civicrm.org>
Sat, 11 Jul 2015 16:49:28 +0000 (12:49 -0400)
committercolemanw <coleman@civicrm.org>
Sat, 11 Jul 2015 16:49:28 +0000 (12:49 -0400)
remove redundant IF & rename contributionType to financialType


Trivial merge