[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5db659: Fixed bad merge