SalesforceFoundation/Cumulus — pull request #904 by mrbelvedere (2014-08-01 03:08:58+00:00)
Title: Merge conflict merging dev into feature/859-schedulable-permissions

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