[Phpmyadmin-devel] Merging changes