Merge branch 'master' of webmasters.boum.org:wiki
commitde8f535266ccb9748681125f4594cb0545c1ddd2
authorTails developers <amnesia@boum.org>
Mon, 23 Feb 2015 09:53:29 +0000 (23 09:53 +0000)
committerTails developers <amnesia@boum.org>
Mon, 23 Feb 2015 09:53:29 +0000 (23 09:53 +0000)
treeab162971d20a7c5a265ef1c8202f30fd9642bbcb
parentfbf6fddd1e38cc378f7757671795a5633426fb45
parent65fd02abd4f77ecd87ec094ee99bdb34aace42cf
Merge branch 'master' of webmasters.boum.org:wiki