openmrs/openmrs-core — pull request #606 by dszafranek (2014-02-03 10:28:00+00:00)
Title: TRUNK-4246: if/else/for/while/do statements should always use curly braces

I fixed merge errors.