From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 13 Jan 2009 00:10:47 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.02~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e6abdfd1c4d72df154f8e3ac64cdec9317c1c39;p=ikiwiki.git

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

7e6abdfd1c4d72df154f8e3ac64cdec9317c1c39