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

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

a8a58a466cd787e4b75328b2e9d689168dd26ba8