From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 28 Dec 2014 18:32:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1d6dec40ebde1afa81aec05a68dc5649782c4b1f

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

1d6dec40ebde1afa81aec05a68dc5649782c4b1f