Gooru/Gooru-Web — pull request #1085 by shivalinga (2014-07-29 07:03:48+00:00)
Title: Message property file conflicts has been resolved.

Message property file conflicts has been resolved.