From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Feb 2008 18:56:34 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~47
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/858d955acf92683d21369b16094cd517698ed9e6?ds=inline

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

858d955acf92683d21369b16094cd517698ed9e6