[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f7de1a: Merge remote-tracking branch 'origin/QA_3_5'

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f7de1a212b95eba8a686d5661a4bec5a0cf197db https://github.com/phpmyadmin/phpmyadmin/commit/f7de1a212b95eba8a686d5661a4b... Author: Michal Čihař <mcihar@suse.cz> Date: 2012-04-12 (Thu, 12 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5'