Change mysqlDie() to return the error message when $exit parameter is false
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Conflicts:
	libraries/Util.class.php