SalesforceFoundation/Cumulus — pull request #1078 by mrbelvedere (2014-10-01 02:56:24+00:00)
Title: Merge conflict merging dev into feature/run-parallel-tests

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