From: Joey Hess Date: Sun, 17 Oct 2010 23:17:00 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20101019~4 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/31e23ddc514faba17bfeb213a6ecaafc806aae1b Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 31e23ddc514faba17bfeb213a6ecaafc806aae1b