[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d80cc2: Forgot to correctly merge changelog