Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit9beff5d27f84953144792b97b335594e3e185c9f
authorTails developers <amnesia@boum.org>
Sun, 22 Dec 2013 18:55:08 +0000 (22 18:55 +0000)
committerTails developers <amnesia@boum.org>
Sun, 22 Dec 2013 18:55:08 +0000 (22 18:55 +0000)
treeae18526b0fbdf46ae998211384d13c8af8223aeb
parent78bc846233f3f02adeec9a35ffe151a8b0cbc362
parent792e69933c30164cb5a58eccbf32bc813ea3380b
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki