Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c8c12767c0e8718f33c59f49d4fcd15af8370d55 https://github.com/phpmyadmin/phpmyadmin/commit/c8c12767c0e8718f33c59f49d4fc... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-09-03 (Thu, 03 Sep 2015)

Changed paths: M test/classes/plugin/import/ImportLdi_test.php

Log Message: ----------- Fix another test

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 2d83476d823a341892cf75e3520fe6ed82780b7a https://github.com/phpmyadmin/phpmyadmin/commit/2d83476d823a341892cf75e3520f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-09-03 (Thu, 03 Sep 2015)

Changed paths: M po/zh_CN.po

Log Message: ----------- Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0123628fbe60...2d83476d823a