Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

ChangeLog

@@ -55,7 +55,9 @@ phpMyAdmin - ChangeLog
 - bug #4559 Logging in causes 100% CPU usage
 - bug #4564 Designer: spaces in table name with edit table link generates bad links
 
-4.2.11.0 (not yet released)
+4.2.12.0 (not yet released)
+
+4.2.11.0 (2014-10-31)
 - bug       ReferenceError: Table_onover is not defined
 - bug #4552 Incorrect routines display for database due to case insensitive checks
 - bug #4259 reCaptcha sound session expired problem