From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 13 May 2008 16:44:06 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.47~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cc69038caa841861b4aa7166a9577e8520f65c0;p=ikiwiki.git

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

6cc69038caa841861b4aa7166a9577e8520f65c0