From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 8 Jul 2008 13:37:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.53~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb4a6fb01a5c3a61c10bb7222d718c9bb7ce2bd3;p=ikiwiki.git

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

eb4a6fb01a5c3a61c10bb7222d718c9bb7ce2bd3