From: Joey Hess <joeyh@joeyh.name>
Date: Sat, 18 Apr 2015 16:35:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150610~103
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2906a3f0f7b6e70197a46104fbad23d70c116c56?hp=2906a3f0f7b6e70197a46104fbad23d70c116c56

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