From: Joey Hess Date: Fri, 2 Oct 2009 22:46:10 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~57 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/82ae1372a451781097086c8041288caca16a8296?ds=sidebyside;hp=-c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 82ae1372a451781097086c8041288caca16a8296