From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 30 Apr 2008 16:58:55 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.45~18
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=7647109bac71f0930717fe90f8eab4bd24960c6a

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

7647109bac71f0930717fe90f8eab4bd24960c6a