From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 14 Mar 2008 22:55:34 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~128
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6263c7c36c662b7292f20f38a2d491e15524faff

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

6263c7c36c662b7292f20f38a2d491e15524faff