From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 17 Mar 2008 18:05:21 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.41~85
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d626a1609b0e26536615fab19fed95c5d1c08e5c;p=ikiwiki.git

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

d626a1609b0e26536615fab19fed95c5d1c08e5c