dimagi/commcare-hq — pull request #3325 by esoergel (2014-05-02 15:52:24+00:00)
Title: Merge in 3295 with minor changes

https://github.com/dimagi/commcare-hq/pull/3295