Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commitaf35b35d30f83f1812d74d9c98ba5787d2084f82
authorTails developers <amnesia@boum.org>
Fri, 3 Jan 2014 13:20:21 +0000 (3 13:20 +0000)
committerTails developers <amnesia@boum.org>
Fri, 3 Jan 2014 13:20:21 +0000 (3 13:20 +0000)
tree9fb054377954358b094caf96d9abc04ceeb61621
parent7bf26a4c9b03dc7f2a6af6642b69f839977fd5f8
parentaa90fcc730044f22f7811c67491879b8e909cc0c
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki