From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Oct 2009 20:53:07 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091017~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=665da89c270f98e93b1eaa89e729f3975973ab8f;p=ikiwiki.git

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

665da89c270f98e93b1eaa89e729f3975973ab8f