[phpMyAdmin Git] [phpmyadmin/phpmyadmin] d3c5bd: Fix a merge mistake