am f2b99f2b: (-s ours) am 336e49a0: (-s ours) am 64cb0d20: (-s ours) am 7460b6e0...
Baligh Uddin [Sun, 19 Oct 2014 22:31:20 +0000 (22:31 +0000)]
* commit 'f2b99f2b88847c3ad323f388a52c8192e962da6b':
  Import translations. DO NOT MERGE


Trivial merge