From: Joey Hess Date: Tue, 9 Oct 2012 14:50:37 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c1582c11eb85bf356c943abf1b31dde3453e73d;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 4c1582c11eb85bf356c943abf1b31dde3453e73d