From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 2 Oct 2015 15:50:44 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20160121~74
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/849b5446fa7279c99242c5cfe457deee0b9165c6

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

849b5446fa7279c99242c5cfe457deee0b9165c6