Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit41ab38003ee8f0fa8c252ce49d01abda1d6ebbda
authorTails developers <amnesia@boum.org>
Tue, 9 Sep 2014 08:48:42 +0000 (9 08:48 +0000)
committerTails developers <amnesia@boum.org>
Tue, 9 Sep 2014 08:48:42 +0000 (9 08:48 +0000)
tree9f7b3f3e9eca70cac2223933a9de489af4217ca3
parentd902180517fbe36bc7309b75757eec38459eed3a
parent051896be46ca97c0fa17b402bc47f3c8598b4c9c
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki