[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 50587e: Merge pull request #22 from Gemorroj/master