am 6ddf7eaa: (-s ours) am 26bc8ca2: (-s ours) am d22d556a: (-s ours) Import translati...
Geoff Mendal [Mon, 20 Oct 2014 20:47:38 +0000 (20:47 +0000)]
* commit '6ddf7eaaa2fc01431e3b71188a3c40674539d7fe':
  Import translations. DO NOT MERGE


Trivial merge