Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commitd57ff399d8fb4034074616f4bbca901a5b8e0aa2
authorTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 09:14:45 +0000 (19 11:14 +0200)
committerTails developers <amnesia@boum.org>
Fri, 19 Jul 2013 09:14:45 +0000 (19 11:14 +0200)
tree334c6e87efd12c530c466a1cf82673d5962a1268
parent61be34dd02405ddb326a33f11953f9e92d8227a0
parent0c7cbfc3e87b80c0b86467b2663550445adee78d
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki