From: Joey Hess Date: Wed, 11 May 2011 01:34: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=0e224c76cc7c9a6b9d2f2bc50f592dea91edcb39;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 0e224c76cc7c9a6b9d2f2bc50f592dea91edcb39