From: Joey Hess Date: Fri, 23 Apr 2010 02:59:06 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100427~38^2~6 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/83dc7d257417944e52cd76bbfaf06090d47723e2 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 83dc7d257417944e52cd76bbfaf06090d47723e2