From: Joey Hess Date: Tue, 26 Jul 2011 15:47:39 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe0cdbef6c51d70e369ff1911e47a6fc883ca9eb;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- fe0cdbef6c51d70e369ff1911e47a6fc883ca9eb