From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 12 Mar 2008 18:46:03 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~136
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e3c6b9bb9d6cef040f9c3f8a86337cf340966806

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

e3c6b9bb9d6cef040f9c3f8a86337cf340966806