From: Joey Hess Date: Fri, 2 Oct 2009 16:38:02 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~74 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c5a9c0cc8265a6a552b1500eb3a3d2aa17b9720;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 1c5a9c0cc8265a6a552b1500eb3a3d2aa17b9720