From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Feb 2008 04:41:33 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06841ed6b3559ea6c2ef37f80e7676b7181492a1;p=ikiwiki.git

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

06841ed6b3559ea6c2ef37f80e7676b7181492a1