fix unescaped parameter, see PMASA-2013-8 for details
add total as parameter to message
[security] Fix stored XSS in Server status monitor, see PMASA-2013-9
[security] Fix stored XSS in navigation panel logo link, see PMASA-2013-9
[security] Fix self-XSS in setup, trusted proxies validation, see PMASA-2013-9
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_parse
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_parse
Make all string function accessible via $GLOBALS['PMA_String']
add test case for PMA_Table
deal with different state of PMA_DRIZZLE
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table
add UT for rename function
add more case for PMA_Table
remove tab
[security] Avoid full path disclosure from some libraries script, see
PMASA-2013-12

Move the PHPMYADMIN constant definition earlier
Fix merge conflicts
[security] Avoid full path disclosure from libraries/common.inc.php, see PMASA-2013-12
Fix merge conflicts
Move protection statement at beginning of script
Fix merge conflicts