Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit5bdae88dc722b5bc1271f9605b4c73bd204e0013
authorTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 20:29:16 +0000 (19 22:29 +0200)
committerTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 20:29:16 +0000 (19 22:29 +0200)
tree0eaa87c1ee7fc33a9a4bce66ac195e258394364e
parentbeb63ce3699308cb3161d442a025d74f5137bd89
parent1d1139c2b6a3bb874ce051ff44c5c9dece3a14c9
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki