From: Joey Hess Date: Tue, 13 Oct 2009 19:07:48 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091017~28 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f6402d22caeecf481826b60791d84cb53210f686;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- f6402d22caeecf481826b60791d84cb53210f686