From: Joey Hess Date: Wed, 19 Nov 2008 22:31:17 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=276b814bb9f53291f1ebe1cc510d49f1ba4719c8;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 276b814bb9f53291f1ebe1cc510d49f1ba4719c8