From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 12 May 2008 21:07:53 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.46~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=328ad8bf0d2b3ac7c20d0079fcc5286685825d88;p=ikiwiki.git

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

328ad8bf0d2b3ac7c20d0079fcc5286685825d88