From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 16 Oct 2008 22:20:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.67~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a80da69cc358b69278005f65dd86aa5a9fbb64cf;p=ikiwiki.git

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

a80da69cc358b69278005f65dd86aa5a9fbb64cf