From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 12 Feb 2009 17:27:33 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.04~24
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b2e634bfec8b68691f1479e094e68e3163c8268f

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

b2e634bfec8b68691f1479e094e68e3163c8268f