From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 11 Mar 2008 19:55:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~154
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cdf88c88216c75051e2e3cfc7844da4611e7c89b

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

cdf88c88216c75051e2e3cfc7844da4611e7c89b