[Phpmyadmin-git] [phpmyadmin/phpmyadmin] db0636: Merge branch 'QA_3_5' of git://github.com/phpmyadm...