From: Joey Hess Date: Thu, 5 May 2011 20:23:47 +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=e3596dbaecb69711616b7bf3b3ef363ee5929293;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- e3596dbaecb69711616b7bf3b3ef363ee5929293