[Phpmyadmin-devel] Merging GSoC branches