From: Joey Hess Date: Mon, 5 Oct 2009 20:19:58 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~37 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=34c72f21627c6fc9f7a383786b8c13b002390da0;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 34c72f21627c6fc9f7a383786b8c13b002390da0