From: Joey Hess <joey@kitenet.net>
Date: Sun, 5 May 2013 04:07:29 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20130518~22
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3d23c87a2e06d4a3e37c836a1c416db11908556d

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

3d23c87a2e06d4a3e37c836a1c416db11908556d