OpenDevelopmentMekong/localisation — pull request #6 by acorbi (2014-09-08 13:34:41+00:00)
Title: Conflict resolution

resolving conflicts in order to merge pull request