Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit2f9cb5d7389c644c61567c72d3c52688fadfb1a1
authorTails developers <amnesia@boum.org>
Tue, 9 Sep 2014 00:20:34 +0000 (9 00:20 +0000)
committerTails developers <amnesia@boum.org>
Tue, 9 Sep 2014 00:20:34 +0000 (9 00:20 +0000)
tree95d78f48d2de55c904fc8738467837ab3ac69874
parent058a3b2966c85e34e738b47a6f5a76e288bb128a
parentde4a0bcc990085481365a1fdfe69485abe172533
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki