From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 7 Jan 2008 21:40:45 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.19~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08cb5f7badff3fdb103cf84890b19b90c0600a4e;p=ikiwiki.git

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

08cb5f7badff3fdb103cf84890b19b90c0600a4e