SalesforceFoundation/Cumulus — pull request #1005 by mrbelvedere (2014-09-03 20:59:47+00:00)
Title: Merge conflict merging dev into feature/883-hierarchical-custom-settings-2

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