SalesforceFoundation/Cumulus — pull request #876 by mrbelvedere (2014-07-24 22:42:51+00:00)
Title: Merge conflict merging dev into feature/760-dmlwrapper-chunking

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