From: Joey Hess Date: Mon, 30 Aug 2010 19:53:49 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100831~21 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=07f30a288d752b3ffd7cbabf1fbc10309364b4e2;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 07f30a288d752b3ffd7cbabf1fbc10309364b4e2