From: Joey Hess Date: Wed, 24 Aug 2011 19:51:28 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e92f292525c615daf98c3bcf6a10a252bc77ebaa;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- e92f292525c615daf98c3bcf6a10a252bc77ebaa