From: Joey Hess Date: Sat, 23 Oct 2010 20:33:29 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20101023~4 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9f301569496e7d4019f41c34be5f07b828952ba8?ds=sidebyside;hp=--cc Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 9f301569496e7d4019f41c34be5f07b828952ba8