From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 3 Aug 2016 19:06:31 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20160905~61
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f582a0fcf202732c418ccd2760739aef8ea55094

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

f582a0fcf202732c418ccd2760739aef8ea55094