From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 2 Mar 2016 20:35:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20160506~67
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1d4ddbb9eb140b9bafe5091143473a52e03887c5?hp=-c

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

1d4ddbb9eb140b9bafe5091143473a52e03887c5