From: Joey Hess Date: Fri, 29 Jul 2011 10:54:39 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d4128e899528c972262efc043eb89ebb34c068bd;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- d4128e899528c972262efc043eb89ebb34c068bd