From: Joey Hess Date: Wed, 7 Oct 2009 18:26:45 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~25 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7e1fc67be6326d63fd6946279b2b78b952113c67?ds=sidebyside;hp=-c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 7e1fc67be6326d63fd6946279b2b78b952113c67