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