From: Joey Hess Date: Fri, 25 Sep 2009 21:03:21 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~105 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c044400184648cbb511b796ad0499e53b21d084;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 1c044400184648cbb511b796ad0499e53b21d084