Merge branch 'QA_3_3'

Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php

libraries/dbi/mysql.dbi.lib.php

@@ -344,6 +344,8 @@ function PMA_DBI_getError($link = null)
         $error_message = PMA_DBI_convert_message($error_message);
     }
 
+    $error_message = htmlspecialchars($error_message);
+
     // Some errors messages cannot be obtained by mysql_error()
     if ($error_number == 2002) {
         $error = '#' . ((string) $error_number) . ' - ' . __('The server is not responding') . ' ' . __('(or the local MySQL server\'s socket is not correctly configured)');