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
Make all string function accessible via $GLOBALS['PMA_String']
[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
[security] Avoid full path disclosure from some libraries scripts, see PMASA-2013-12
Delete .htaccess which does not work on all web servers
Remove other .htaccess for directories which are not at risk
ChangeLog entry for full path disclosure fixes
Configuration values for hide/unhide navigation items feature
Hide tables in navigation tree
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2
Add a dialog to unhide hidden navigation tree items