From: Joey Hess Date: Fri, 12 Nov 2010 15:06:50 +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=f942c2db05e4da9188f36c5df1d42aea709208bf;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- f942c2db05e4da9188f36c5df1d42aea709208bf