From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 18 Oct 2008 00:28:24 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~195
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a62836d288fbced42b04a172baf52063ef71c61;p=ikiwiki.git

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

9a62836d288fbced42b04a172baf52063ef71c61