am fa40889f: (-s ours) am 1b1c5777: (-s ours) am 7460b6e0: (-s ours) Import translati...
Baligh Uddin [Wed, 29 Oct 2014 09:55:34 +0000 (09:55 +0000)]
* commit 'fa40889f1034b221489903d80d9f12337f9f0320':


Trivial merge