jlantz/GrantLifecycleApp — pull request #8 by mrbelvedere (2014-10-09 04:25:27+00:00)
Title: Merge conflict merging master into feature/require-pub-1.5

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