SalesforceFoundation/Cumulus — pull request #1069 by mrbelvedere (2014-09-26 20:02:08+00:00)
Title: Merge conflict merging dev into feature/983-data-importer

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