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