From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 4 Feb 2008 23:36:16 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~19
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f7c575bd30b2b4a66ca73dedec1984872fdf8372?ds=inline

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

f7c575bd30b2b4a66ca73dedec1984872fdf8372