From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 29 Oct 2009 22:07:04 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091031~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6b78c97d86b776544b01eaa595d5d335d11731a;p=ikiwiki.git

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

a6b78c97d86b776544b01eaa595d5d335d11731a