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