From: Joey Hess Date: Wed, 19 Nov 2008 22:31:32 +0000 (-0500) Subject: Merge branch 'master' of file:///srv/git/ikiwiki.info X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e1a89e219a202fceffb0de5add8377da1a754d3b?ds=inline;hp=--cc Merge branch 'master' of file:///srv/git/ikiwiki.info --- e1a89e219a202fceffb0de5add8377da1a754d3b