From: Joey Hess Date: Wed, 10 Oct 2012 14:45:38 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2eb11762169bd8f1d5ee52020159bd4e2215ed4f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 2eb11762169bd8f1d5ee52020159bd4e2215ed4f