From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 15 Feb 2009 02:42:00 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.04~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3e19033a6dd0f5604428b535367347f69ae48d98

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

3e19033a6dd0f5604428b535367347f69ae48d98