From: Joey Hess Date: Fri, 5 Aug 2011 20:37:57 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be556863cbb7f3f2553bfd9a2b3fdf90ed4882c2;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- be556863cbb7f3f2553bfd9a2b3fdf90ed4882c2