From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 9 Jan 2008 02:01:54 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.19^0
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/dc16e386819da912a5fa37214a0d1335cc4d97f5?ds=inline

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

dc16e386819da912a5fa37214a0d1335cc4d97f5