am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translati...
Baligh Uddin [Thu, 16 Oct 2014 19:46:47 +0000 (19:46 +0000)]
automerge: e6feecb  -s ours

* commit 'e6feecb1837d84a5d529b1ac07c1a5167f8aac30':
  Import translations. DO NOT MERGE


Trivial merge