[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d77db9: Merge pull request #3 from mynetx/master