From: Joey Hess Date: Thu, 11 Oct 2012 15:22:50 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef0c569a956f97ee02df16c1a3e8f3cb2993a62a;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- ef0c569a956f97ee02df16c1a3e8f3cb2993a62a