From: Joey Hess Date: Sun, 20 May 2012 00:35:21 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29b00c0f9b85cc7ac5cbbe17927639008dc9e1e4;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 29b00c0f9b85cc7ac5cbbe17927639008dc9e1e4