From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 21 Mar 2008 23:09:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.41~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd2ddd9e87f758e5d2987708321ec0c6c0dd6898;p=ikiwiki.git

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

fd2ddd9e87f758e5d2987708321ec0c6c0dd6898