SalesforceFoundation/Cumulus — pull request #360 by mrbelvedere (2014-02-06 15:29:43+00:00)
Title: Merge conflict merging dev into feature/154-managed-beta-release

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