From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 3 Jun 2016 05:37:01 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20160728~42
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/04f17b382f644c35d93928f48f6b79564fa1344c

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

04f17b382f644c35d93928f48f6b79564fa1344c