From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 27 Oct 2009 06:13:16 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091031~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ba54879eb27799945f5eaf2c83ad26271f6e5b0;p=ikiwiki.git

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

4ba54879eb27799945f5eaf2c83ad26271f6e5b0