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