From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 24 Apr 2008 17:49:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.44~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bb7f948563fd5305aa95fc71bd2cb7f5c85bb25;p=ikiwiki.git

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

6bb7f948563fd5305aa95fc71bd2cb7f5c85bb25