Merge branch 'master' of webmasters.boum.org:wiki
commit281f146ad685110349d95d0230a3e6cb7d5b8ab2
authorTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:30:58 +0000 (24 08:30 +0000)
committerTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:30:58 +0000 (24 08:30 +0000)
tree5ade8f9022a4d567bd195db121b55690c842aa22
parentac6ae31e0abc19615dfde4a252d8b9b5341f47d3
parent468b4beb9f548302a5cc9eaf23af9ed2eb2ed1ba
Merge branch 'master' of webmasters.boum.org:wiki