From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 29 Sep 2008 22:10:19 +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/0d3878896fa250cd1a6d4b1e7991714ca8478f36?ds=sidebyside

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

0d3878896fa250cd1a6d4b1e7991714ca8478f36