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