From: Joey Hess Date: Fri, 6 Apr 2012 18:32:05 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=089e72caa7dc9976ab009fabd1dab9eaad0cf4ff;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 089e72caa7dc9976ab009fabd1dab9eaad0cf4ff