SalesforceFoundation/Cumulus — pull request #430 by mrbelvedere (2014-02-20 03:17:04+00:00)
Title: Merge conflict merging dev into feature/381-default-settings-oninstall

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