From: Joey Hess Date: Tue, 21 Feb 2012 17:05:36 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1968dbb24bbf9da41fce0cdaa64aa4495412c7c;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- b1968dbb24bbf9da41fce0cdaa64aa4495412c7c