From: Martin Zobel-Helas <zobel@ftbfs.de>
Date: Thu, 8 Feb 2018 16:40:07 +0000 (+0100)
Subject: Merge branch 'master' of git2.debian.org:dsa/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=d706e82902eb51bc2b34d5c4c861d26739eab188;hp=d706e82902eb51bc2b34d5c4c861d26739eab188

Merge branch 'master' of git2.debian.org:dsa/dsa-wiki
---