From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 3 Apr 2008 06:36:16 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.42~32
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a4dc0f997c2d64c21e08d06382b9f3c3987a681f

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

a4dc0f997c2d64c21e08d06382b9f3c3987a681f