From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 14 Jun 2008 15:39:34 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/878e74238e7f9f243e3b0222e2915a148ac8bef1

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

878e74238e7f9f243e3b0222e2915a148ac8bef1