From: Joey Hess Date: Thu, 19 Jul 2012 17:48:56 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56de5b2d89e38309c9152a0e98a3c65453c8009e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 56de5b2d89e38309c9152a0e98a3c65453c8009e