Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...