From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 6 Jun 2019 21:18:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20200202.3~63
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/123480795ee843644287061df1168a999d4f1496

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

123480795ee843644287061df1168a999d4f1496