am c11548ea: (-s ours) am b4f1c7f1: (-s ours) am eb140c18: (-s ours) Import translati...
Baligh Uddin [Wed, 29 Oct 2014 09:55:32 +0000 (09:55 +0000)]
* commit 'c11548ea62820a1f5fbbc0a60ae254f7de6247a6':


Trivial merge