From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 27 Sep 2008 15:17:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=415e9a678dcc32fc57b71aa6c47886cc1c94e359;p=ikiwiki.git

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

415e9a678dcc32fc57b71aa6c47886cc1c94e359