From: Joey Hess Date: Tue, 7 Sep 2010 16:30:40 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100915~49 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/21b6fa937b11db46359a1a6aec85d33aca0551a8?ds=sidebyside;hp=21b6fa937b11db46359a1a6aec85d33aca0551a8 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info ---