From: Joey Hess Date: Fri, 25 Feb 2011 18:59:13 +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=02bf6a281981bf61ab0526e60c7ec931d6cd79b4;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 02bf6a281981bf61ab0526e60c7ec931d6cd79b4