From: Joey Hess Date: Wed, 30 Sep 2009 19:40:15 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~85 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54f352bb74d3531b1c7ec4d8c7c5c1d5d1eabc65;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 54f352bb74d3531b1c7ec4d8c7c5c1d5d1eabc65