From: Joey Hess <joey@kitenet.net>
Date: Mon, 24 Nov 2014 15:25:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~79
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/509370d91ddc4871a60d48dc1dbd95e9a2eaff48

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

509370d91ddc4871a60d48dc1dbd95e9a2eaff48