From: Joey Hess Date: Thu, 8 Oct 2009 17:56:54 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~12 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=586c35de30781821050c6f3237da2340ca6a51b5;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 586c35de30781821050c6f3237da2340ca6a51b5