From: Joey Hess <joey@kitenet.net>
Date: Sun, 11 Aug 2013 12:58:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130904~39
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/63078f2e4f145f8e14e281ed1eb265a67b87b9ea

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

63078f2e4f145f8e14e281ed1eb265a67b87b9ea