From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 24 Feb 2008 21:40:34 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.40~58
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d4c7b44ea0cb77b40ffcd0a65d2d6caab0a69e09

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

d4c7b44ea0cb77b40ffcd0a65d2d6caab0a69e09