From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 25 Sep 2008 22:27:10 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~87
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6535c61746ba6946284be674f666c99ae8af82f0;p=ikiwiki.git

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

6535c61746ba6946284be674f666c99ae8af82f0