Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit26928a8dc6f234567540dd1dc9edd48031d65dc2
authorTails developers <amnesia@boum.org>
Thu, 31 Jul 2014 14:33:17 +0000 (31 16:33 +0200)
committerTails developers <amnesia@boum.org>
Thu, 31 Jul 2014 14:33:17 +0000 (31 16:33 +0200)
treebe91cb06b389f776c06ebe11dd40be012529eb1f
parent156e2fa6a52b8199563545df5688c0047dc85d37
parent3246d2932e6be4644a796b722e50efbbb99f6c83
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki