From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 7 Jul 2008 05:51:49 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.53~82
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2aac9cdb30f1dd6202cca44e505a0e6481e3dd6c;p=ikiwiki.git

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

2aac9cdb30f1dd6202cca44e505a0e6481e3dd6c