[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3370ee: Merge branch 'master' of git://github.com/phpmyadm...