From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 4 Feb 2009 18:52:29 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.04~69
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8d26eaa9a4309e9dbd173120be108b671edad2df

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

8d26eaa9a4309e9dbd173120be108b671edad2df