From: Joey Hess Date: Tue, 19 Oct 2010 06:31:50 +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=ecac1e79a69894b78daccbd5b79a21a8dbbb1592;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- ecac1e79a69894b78daccbd5b79a21a8dbbb1592