From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Mar 2011 17:09:14 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~131
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/116672d7d72d8181607f69ad22ad8bd0bb9d8348?hp=e548b0c24575a91ba4678e9cf1b78e02ff15d887

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/doc/security.mdwn b/doc/security.mdwn
index fb211cd12..916bd0484 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -466,7 +466,7 @@ with the comments plugin enabled. ([[!cve CVE-2011-0428]])
 
 ## possible javascript insertion via insufficient htmlscrubbing of alternate stylesheets
 
-Tango noticed that 'meta stylesheet` directives allowed anyone
+Giuseppe Bilotta noticed that 'meta stylesheet` directives allowed anyone
 who could upload a malicious stylesheet to a site to add it to a
 page as an alternate stylesheet, or replacing the default stylesheet.