Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit25677d9cdc368cd76f2ecc404ec74f9248b74782
authorTails developers <amnesia@boum.org>
Sun, 24 Aug 2014 18:46:29 +0000 (24 18:46 +0000)
committerTails developers <amnesia@boum.org>
Sun, 24 Aug 2014 18:46:29 +0000 (24 18:46 +0000)
tree5993a23ebb7d8a1fdf65c47caf9d52b0ea0cd705
parent4c154a9bfe2047f0920205b6c77d87811e9ade7d
parent0f1cd346af29c5a572159b01110266d008f6119d
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki