dimagi/commcare-odk — pull request #22 by orangejenny (2014-08-28 21:26:56+00:00)
Title: Fix bad merge

Well, this is embarrassing.

@ctsims can you review?