SalesforceFoundation/Cumulus — pull request #1136 by mrbelvedere (2014-10-29 18:44:15+00:00)
Title: Merge conflict merging dev into feature/1045-ref-cumulusci

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