am c7f102af: (-s ours) am f4b1e9c8: (-s ours) am 09128d0a: (-s ours) Import translati...
Baligh Uddin [Tue, 16 Sep 2014 17:17:25 +0000 (17:17 +0000)]
* commit 'c7f102af0b5025fc5ce0ba6690bfaafc49a44d42':
  Import translations. DO NOT MERGE


Trivial merge