dimagi/javarosa — pull request #7 by orangejenny (2014-08-22 19:11:24+00:00)
Title: Reconcile build

Merge 2.14 QA and UAT changes into master.