From: Joey Hess Date: Mon, 4 Oct 2010 14:54:44 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c76909d035effd8050081e43736c570372d36c10;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- c76909d035effd8050081e43736c570372d36c10