From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 23 Sep 2008 23:34:14 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.65~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bc10e4dd012fef0637c54c8d44baaf958d8ae729;p=ikiwiki.git

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

bc10e4dd012fef0637c54c8d44baaf958d8ae729