From: Joey Hess Date: Fri, 2 Oct 2009 18:06:55 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~73 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/547bbebcbc81d13d79eeb72e9c1bf7f95f514835?ds=inline;hp=--cc Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 547bbebcbc81d13d79eeb72e9c1bf7f95f514835