Merge remote-tracking branch 'mercedes508/translation'
commit319d1d788c366a5d94161a2bd88ce8b67cc2801a
authorTails developers <amnesia@boum.org>
Thu, 14 Aug 2014 08:49:22 +0000 (14 08:49 +0000)
committerTails developers <amnesia@boum.org>
Thu, 14 Aug 2014 08:49:22 +0000 (14 08:49 +0000)
tree53d0825113610eb470104372060b0e5939e50831
parent834497ac3ad5cedc39dcabc9acacdb0a2f9f95f4
parent10c51a25c2b1216719745a1328dd36f44d28d1c2
Merge remote-tracking branch 'mercedes508/translation'