From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 19 Mar 2008 19:15:30 +0000 (-0400)
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/d8c4ea783be95b0ec0f4c69a4a1f230ac0e43601

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

d8c4ea783be95b0ec0f4c69a4a1f230ac0e43601