From: Joey Hess Date: Fri, 3 Jun 2011 15:29:26 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a42bbcb875aeb1e6715842cdb926952e18a3e439;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- a42bbcb875aeb1e6715842cdb926952e18a3e439