From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 11 Nov 2008 18:40:50 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.69~8
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/72a2fa9441dc37bc2a6ce6337b940271a66b6ec1

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

72a2fa9441dc37bc2a6ce6337b940271a66b6ec1