From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Feb 2008 05:32:15 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~52
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/89000b48f3cb809b13aa64db79abb90d446458b9

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

89000b48f3cb809b13aa64db79abb90d446458b9