From: Joey Hess Date: Fri, 18 Jun 2010 16:56:57 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100623~40 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97c1ae2ef38f0602d879f4e391aad4f523e8c47a;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 97c1ae2ef38f0602d879f4e391aad4f523e8c47a