From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 7 Jan 2018 17:39:55 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20180228~48
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f0121f8c62cec1c9bd01dce308114f9bb3958728

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

f0121f8c62cec1c9bd01dce308114f9bb3958728