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

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