[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3236ae: Fix merge error - 7075cb0a41007030f48c549d0085f990405915c0