[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4705e1: Merge remote-tracking branch 'origin/master'

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4705e1fa9c94d45ac77bf7515a80c8f2667710f7 https://github.com/phpmyadmin/phpmyadmin/commit/4705e1fa9c94d45ac77bf7515a8… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-03-14 (Wed, 14 Mar 2012) Changed paths: M db_operations.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: 90964a6980bc50b2db5ab138d9b99c45ae4e3954 https://github.com/phpmyadmin/phpmyadmin/commit/90964a6980bc50b2db5ab138d9b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-03-15 (Thu, 15 Mar 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5 Commit: 3c5df2f578fc14ad60b8d3771af00b22575be857 https://github.com/phpmyadmin/phpmyadmin/commit/3c5df2f578fc14ad60b8d3771af… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-03-15 (Thu, 15 Mar 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2f10510...3c5df2f