From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 25 Aug 2009 21:18:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.1415926~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3548b6214f67209b6ba87b741bf8ec45d3256f4f;p=ikiwiki.git

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

3548b6214f67209b6ba87b741bf8ec45d3256f4f