[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 942a9d: Merge branch 'master' of github.com:phpmyadmin/php...