SalesforceFoundation/Cumulus — pull request #474 by mrbelvedere (2014-03-03 17:53:41+00:00)
Title: Merge conflict merging dev into feature/47-hhaccount-conversion

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