From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 28 Aug 2008 17:05:33 +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/a4d033691ab8d00f4217e49dad35474be4763d1e?hp=-c

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

a4d033691ab8d00f4217e49dad35474be4763d1e