From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 23 Dec 2014 18:20:19 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20150107~13
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9f62caaff7676ee87d7ab348064a8f8a93f488ac

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

9f62caaff7676ee87d7ab348064a8f8a93f488ac