Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit47dbfbb64a6735720f148315da30bc225534cc80
authorTails developers <amnesia@boum.org>
Mon, 22 Sep 2014 17:40:31 +0000 (22 17:40 +0000)
committerTails developers <amnesia@boum.org>
Mon, 22 Sep 2014 17:40:31 +0000 (22 17:40 +0000)
tree7749fbd959119f5d9371a62e398a687cae877aca
parent3a6d6fa34a7ec81c225ff64b68d28823e337cfa9
parentfe52a2c0a8f04b33fec298e4bf05c748af569ab4
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki