From: Joey Hess Date: Wed, 2 Dec 2009 17:58:59 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091202~3 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e417e7a66e9109ac510e4b9a7747224d60dba85e?hp=-c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- e417e7a66e9109ac510e4b9a7747224d60dba85e