From: Joey Hess Date: Tue, 15 Jun 2010 17:34:45 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100623~60 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3d63817c8ba2066ff942823baafa94b44a4e9af;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- d3d63817c8ba2066ff942823baafa94b44a4e9af