From: Joey Hess Date: Mon, 28 Mar 2011 17:09:14 +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=116672d7d72d8181607f69ad22ad8bd0bb9d8348;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 116672d7d72d8181607f69ad22ad8bd0bb9d8348