From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 2 Feb 2008 22:51:47 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.30^0
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/05e180096c6ef808ab16cce4922595eeca9b9b25

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

05e180096c6ef808ab16cce4922595eeca9b9b25