[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3aab0b: Merge pull request #21 from mratajsky/master