Merge remote branch 'origin/MAINT_2_11_11' into QA_2_11

phpmyadmin · Jan 6, 2011 · 3f9fd25 · 3f9fd25
2 parents b01a581 + 61d9e56
commit 3f9fd25
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -7,8 +7,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 
 2.11.12.0 (not yet released)
 
-2.11.11.1 (2010-11-26)
-- bug #3115519 (private) [security] XSS on db search
+2.11.11.1 (2010-11-29)
+- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8
 
 2.11.11.0 (2010-09-07)
 - [core] Fix broken cleanup of $_GET