am c159de74: (-s ours) am 4bafe763: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Dec 2013 21:30:13 +0000 (21:30 +0000)]
* commit 'c159de74b326050eeb3dc2683a3ab55cbed9aadd':


Trivial merge