SalesforceFoundation/Cumulus — pull request #1027 by mrbelvedere (2014-09-10 12:43:06+00:00)
Title: Merge conflict merging dev into feature/499-hh-account-lookup-filters

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