From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 23 Jan 2009 21:54:13 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.03~43
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a471ac68c8332cdee765896581db91c90b5a19e2?ds=inline

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

a471ac68c8332cdee765896581db91c90b5a19e2