From: Joey Hess Date: Sun, 27 Sep 2009 22:34:50 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091009~99 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a366910d30a0ff07a16f3d0505e0584a63a465a;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 1a366910d30a0ff07a16f3d0505e0584a63a465a