From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 30 May 2008 00:47:57 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.48~8
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=3a23cdde7d5621bc8d723d2226945ee5243115f3

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

3a23cdde7d5621bc8d723d2226945ee5243115f3