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-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/08cb5f7badff3fdb103cf84890b19b90c0600a4e

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

08cb5f7badff3fdb103cf84890b19b90c0600a4e