dimagi/commcare-hq — pull request #4814 by esoergel (2014-11-17 14:10:22+00:00)
Title: Make format clearer with multiple merge conflicts

Really small