SalesforceFoundation/Cumulus — pull request #975 by mrbelvedere (2014-08-25 20:26:39+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