From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 28 Apr 2016 23:34:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20160506~19
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/fe7ec461d42cdf0056c7aca02f6631a65ac6a116?ds=sidebyside;hp=fe7ec461d42cdf0056c7aca02f6631a65ac6a116

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