From: colemanw <coleman@civicrm.org>
Date: Sat, 11 Jul 2015 16:49:28 +0000 (-0400)
Subject: Merge pull request #6196 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3ba0304fd74f29fb52c456d122c1de86fc9ff517;p=civicrm-core.git

Merge pull request #6196 from eileenmcnaughton/master

remove redundant IF & rename contributionType to financialType
---

3ba0304fd74f29fb52c456d122c1de86fc9ff517