Merge remote-tracking branch 'origin/master' into wiki/7258-img-clickable
commit1da1efe8f94fdb079edfecf5161e63a7de8e0571
authorTails developers <amnesia@boum.org>
Sat, 20 Sep 2014 17:45:39 +0000 (20 19:45 +0200)
committerTails developers <amnesia@boum.org>
Sat, 20 Sep 2014 17:45:39 +0000 (20 19:45 +0200)
treeaa2e12a96ae97c43a1d36023f2197f0742880f71
parent276d3d96a131edee0e796ee12efa3d9192792e92
parent4cd4d026294e2a909da34cc7aa516b87d1e72fec
Merge remote-tracking branch 'origin/master' into wiki/7258-img-clickable