From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 27 Mar 2009 17:45:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.09~41
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32008f8fce2d4c513693f58b28314e08ed631cfe;p=ikiwiki.git

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

32008f8fce2d4c513693f58b28314e08ed631cfe