Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit22a58c466ce60f80d51dd4990b397a68b3f8430c
authorTails developers <amnesia@boum.org>
Sat, 26 Jul 2014 12:11:15 +0000 (26 12:11 +0000)
committerTails developers <amnesia@boum.org>
Sat, 26 Jul 2014 12:11:15 +0000 (26 12:11 +0000)
treece42cd2bf2a4d60e9724d7e7efa3e3a754a29686
parente0a5ca4b954797cd6ca20f8781e3671becfc5113
parent4696314cf74a3045da04d79b59576269b2190d1e
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki