Merge remote branch 'seb/translation' into translation
commitd0e39ad6a1feab665b341f4ed52ad7c2b6a23ba7
authorTails developers <amnesia@boum.org>
Thu, 17 Jul 2014 15:23:39 +0000 (17 15:23 +0000)
committerTails developers <amnesia@boum.org>
Thu, 17 Jul 2014 15:23:39 +0000 (17 15:23 +0000)
tree997cc3e5adbb8746e62aeaf91a07db7a5eb1ec91
parent3bf59a391ebad970b83efd03b4951a913232ef1f
parent0bf6716d26ba2bdf6b511f1114446f405c00263e
Merge remote branch 'seb/translation' into translation