From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 1 Oct 2008 21:24:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.66~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2b1a918b022863c6baf010bee3e57b5f08a794f;p=ikiwiki.git

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

f2b1a918b022863c6baf010bee3e57b5f08a794f