From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 9 Jul 2008 04:25:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.53~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/458e5dc65f4ac9ac016c843b48bf08203c920b08

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

458e5dc65f4ac9ac016c843b48bf08203c920b08