From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 12 Nov 2007 17:33:39 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.12~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c3135c6a8e3f0770c6efdb8c5765affedb61106;p=ikiwiki.git

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

3c3135c6a8e3f0770c6efdb8c5765affedb61106