SalesforceFoundation/Cumulus — pull request #602 by mrbelvedere (2014-04-08 21:31:21+00:00)
Title: Merge conflict merging dev into feature/npsp-packages-upgrade

mrbelvedere tried to merge new commits to dev but hit a merge conflict. Please resolve manually