From: Joey Hess Date: Tue, 25 Jan 2011 00:02:10 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=d50632674e8ed0b75ac991bcbfb20c26ddc4162c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- d50632674e8ed0b75ac991bcbfb20c26ddc4162c