am d5c43876: (-s ours) am 1a0e1c0e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 29 Oct 2013 03:55:13 +0000 (20:55 -0700)]
* commit 'd5c438761040510845e67979079f37da0737966f':
  Import translations. DO NOT MERGE


Trivial merge