From: Joey Hess Date: Mon, 30 Jan 2012 19:40:31 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d99f065dd69e029ed4c18af709c6b3d48de7b07d;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- d99f065dd69e029ed4c18af709c6b3d48de7b07d