From: Joey Hess Date: Wed, 29 Sep 2010 16:00:34 +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=e65ce4f0937eaf622846c02a9d39fa7aebe4af12;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- e65ce4f0937eaf622846c02a9d39fa7aebe4af12