SalesforceFoundation/Cumulus — pull request #361 by mrbelvedere (2014-02-06 15:29:45+00:00)
Title: Merge conflict merging dev into feature/253-build-package-xml

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