From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 5 Sep 2008 16:37:57 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.63~9^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f9618417753fc680eaaa6b42b8555e625103a619;p=ikiwiki.git

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

f9618417753fc680eaaa6b42b8555e625103a619