From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 10 Apr 2008 21:12:55 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.42~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d5c964508f159c7209b98771bed1ec8df4c952a0

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

d5c964508f159c7209b98771bed1ec8df4c952a0