From: Luca Filipozzi <lfilipoz@emyr.net>
Date: Wed, 9 Aug 2017 16:10:43 +0000 (+0000)
Subject: Merge branch 'master' of ssh://ubergit.debian.org/dsa/wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=0d91500135c9315cd1cf40580280f2128b518722;p=mirror%2Fdsa-wiki.git

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

0d91500135c9315cd1cf40580280f2128b518722