Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit72cb8f9e62ffefd38f408688702c3431d600c712
authorTails developers <amnesia@boum.org>
Fri, 29 Nov 2013 17:16:14 +0000 (29 17:16 +0000)
committerTails developers <amnesia@boum.org>
Fri, 29 Nov 2013 17:16:14 +0000 (29 17:16 +0000)
tree347a6b145d67f76cafe76084bd35f31af429a282
parent4f94e883b94a9415f02e4955d71bfb7c328d046b
parentd80bb5e89bfc4d6a8427d3ebbacc4d2d3fd76ce3
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki