From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 1 Oct 2008 18:47:49 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7308f3da5bf2518f5a9659c7de6212ed5648f27b;p=ikiwiki.git

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

7308f3da5bf2518f5a9659c7de6212ed5648f27b