From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 30 Jan 2008 06:38:59 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.30~19
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ddfa16145ac4c9938606104b685b382e2acd2f05

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

ddfa16145ac4c9938606104b685b382e2acd2f05