From: Joey Hess Date: Fri, 11 May 2012 04:19:06 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a69c25fde0201de1addf44a55c2e6cd5334f50ea;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- a69c25fde0201de1addf44a55c2e6cd5334f50ea