From: Joey Hess Date: Wed, 9 Feb 2011 18:47:42 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af3e7a30ce3308ff11bc63f8c92ec79f9ebe3021;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- af3e7a30ce3308ff11bc63f8c92ec79f9ebe3021