Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
commit36a241098218964210ab5a523032f9f9abaf344b
authorTails developers <amnesia@boum.org>
Tue, 27 Jan 2015 11:50:15 +0000 (27 11:50 +0000)
committerTails developers <amnesia@boum.org>
Tue, 27 Jan 2015 11:50:15 +0000 (27 11:50 +0000)
tree100f5699e610e75b791f4043c2298cba0d8e6a9e
parent5b80b2d76e03477d21731d8b6570443b52d25e74
parent245f8f9c456975cec0ff115ee11cb9f93ef7d17a
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki