[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d66311: Merge branch 'MAINT_3_5_0' into QA_3_5

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d66311470055c75c69b4073d5fefe438583f69f5 https://github.com/phpmyadmin/phpmyadmin/commit/d66311470055c75c69b4073d5fef... Author: Marc Delisle <marc@infomarc.info> Date: 2012-04-07 (Sat, 07 Apr 2012) Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5