From: Joey Hess Date: Tue, 30 Aug 2011 15:38:30 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2c2c537dd521bbc659f0499af72ca70078d97d50;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 2c2c537dd521bbc659f0499af72ca70078d97d50