From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 28 May 2008 19:38:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.48~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=774a5f86b2fa8dcbc561c50901cf655711e836dc;p=ikiwiki.git

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

774a5f86b2fa8dcbc561c50901cf655711e836dc