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

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

0d3878896fa250cd1a6d4b1e7991714ca8478f36