From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 5 Feb 2009 02:09:44 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.04~66
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/eaf2b6429bd42707030ad22dc26dec4f4c5d302b

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

eaf2b6429bd42707030ad22dc26dec4f4c5d302b