Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit99e1738d7c6a6f5c0d91b0e3369e7695485b650b
authorTails developers <amnesia@boum.org>
Wed, 26 Jun 2013 13:53:37 +0000 (26 13:53 +0000)
committerTails developers <amnesia@boum.org>
Wed, 26 Jun 2013 13:54:01 +0000 (26 15:54 +0200)
treefcdc30b38e241a250defaf15fc087d5cd66a7dbc
parent41bcb1dff03e2fb79110b0e6b4a8faaf602339d0
parentc73bc66162cb263d9581994f849378b1848de2d3
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki