Merge remote-tracking branch 'matsa/translation'
commit258515f1db94469c57645c6a1cd179eb35b5884e
authorTails developers <amnesia@boum.org>
Thu, 23 Oct 2014 05:31:19 +0000 (23 05:31 +0000)
committerTails developers <amnesia@boum.org>
Thu, 23 Oct 2014 05:31:19 +0000 (23 05:31 +0000)
tree2083d6c7733481a8103414878918c4f9ce2f65da
parent69c86e7e3bf3d22e07bbeae997250756c28df3fa
parentee4a333ba1e0fb3dc726a2339f1246f2c8ffee6b
Merge remote-tracking branch 'matsa/translation'