[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ffdba9: Fix wrong merge