From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 7 Nov 2007 21:59:44 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.12~36
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2ed67f7fe7290aa39144d0289bf7205cd421d386

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

2ed67f7fe7290aa39144d0289bf7205cd421d386