From: Joey Hess Date: Tue, 31 Aug 2010 18:30:00 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100831~1 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/87f01dac2e1680b90e655c7bb663906b2be5de1c?ds=sidebyside;hp=--cc Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 87f01dac2e1680b90e655c7bb663906b2be5de1c