From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 21 Oct 2008 21:57:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~111
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a18fea41cd562b090c77fab2d98544ba07e357a1;p=ikiwiki.git

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

a18fea41cd562b090c77fab2d98544ba07e357a1