From: Joey Hess Date: Thu, 28 Oct 2010 19:38:24 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea48e1c038bfdab5820383cb885360c1d3fe2a14;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- ea48e1c038bfdab5820383cb885360c1d3fe2a14