[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 329877: Merge pull request #25 from nijel/master