From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 21 Jan 2019 15:44:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20190207~44
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/beaebab04bfa87b18286ecc1e8aef4ae87615e57

Merge branch 'master' of ssh://git.ikiwiki.info
---

beaebab04bfa87b18286ecc1e8aef4ae87615e57