From: Joey Hess Date: Tue, 31 May 2011 20:24:13 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a24c0c543d4e4111dc206813889558bd5376fc8e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- a24c0c543d4e4111dc206813889558bd5376fc8e