From: Joey Hess Date: Tue, 27 Dec 2011 16:33:21 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c8a4ffff53e916ec373f9463d0c2c47deebfadd0;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- c8a4ffff53e916ec373f9463d0c2c47deebfadd0