From: Joey Hess Date: Thu, 26 Apr 2012 16:54:55 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a29599d68aec2797eb6b3b48c8a151025a4d6fa4;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- a29599d68aec2797eb6b3b48c8a151025a4d6fa4