SalesforceFoundation/Cumulus — pull request #1134 by mrbelvedere (2014-10-29 18:44:13+00:00)
Title: Merge conflict merging dev into feature/721-allocations

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