From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 28 Nov 2008 16:53:35 +0000 (-0800)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.71~210
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93a43084d0257552b7a61d40e6b3ceda8624cc55;p=ikiwiki.git

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

93a43084d0257552b7a61d40e6b3ceda8624cc55