From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 20:26:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091017~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=402fd5e63b9888ef9f98bb667087ae0398f6ce8b;p=ikiwiki.git

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

402fd5e63b9888ef9f98bb667087ae0398f6ce8b