From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 7 Mar 2008 17:25:55 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~174
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/39c75e7fd497954f3c009b808e6305cc31c13fab

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

39c75e7fd497954f3c009b808e6305cc31c13fab