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

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

99fce0af0d4e99bc81ef7847bfbe77662763e805