From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 14 May 2008 06:42:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.47~34
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6983e05e8f9f6188b537e2ea1add5120752d9025;p=ikiwiki.git

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

6983e05e8f9f6188b537e2ea1add5120752d9025