From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 14 May 2015 14:46:59 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150610~65
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/804144402bd6b3b52b3e38aff7cc0812ac1ba0c8

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

804144402bd6b3b52b3e38aff7cc0812ac1ba0c8