From: Joey Hess Date: Sat, 23 Oct 2010 20:19:45 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20101023~8 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d2359d50cab3647bfec8fc2c3147a9af2c4ecd67 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- d2359d50cab3647bfec8fc2c3147a9af2c4ecd67