SalesforceFoundation/Cumulus — pull request #428 by mrbelvedere (2014-02-19 20:17:39+00:00)
Title: Merge conflict merging dev into feature/424-remove-picklist-sorted

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