am c2db3586: (-s ours) am e6841c13: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 27 Aug 2015 12:18:01 +0000 (12:18 +0000)]
* commit 'c2db3586005f87ecb85886c031c3bfa6040c7c4c':


Trivial merge