SalesforceFoundation/Cumulus — pull request #391 by mrbelvedere (2014-02-11 19:20:21+00:00)
Title: Merge conflict merging dev into feature/215-ant-update-metaxml

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