[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c22698: Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin