am 1f55a53d: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 27 Oct 2014 18:53:21 +0000 (18:53 +0000)]
* commit '1f55a53d53a10026bfdbf747cc70f7b7773d9e1e':


Trivial merge