From: Joey Hess Date: Fri, 3 Feb 2012 02:43:25 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 7f591d22d9fbfab836798fe9e5a3dc71b1c5b9f7