Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ae92e02dbfa9f81e1ea68a74f838d6f48dbbc73c https://github.com/phpmyadmin/phpmyadmin/commit/ae92e02dbfa9f81e1ea68a74f838... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M libraries/dbi/DBIDummy.class.php Log Message: ----------- Fix tests Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 99c0ace7efd1abc661f37656017ae3908f2989a4 https://github.com/phpmyadmin/phpmyadmin/commit/99c0ace7efd1abc661f37656017a... Author: Vincent Lau <3092849@qq.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Chinese (China)) Currently translated at 76.9% (2468 of 3209 strings) [CI skip] Commit: 0123628fbe60973f68be101e29245841cd571d87 https://github.com/phpmyadmin/phpmyadmin/commit/0123628fbe60973f68be101e2924... Author: Weblate <noreply@weblate.org> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M libraries/dbi/DBIDummy.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 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 Commit: 491ccf1f1315ac68f5b6f69f76f0c2818c12bd05 https://github.com/phpmyadmin/phpmyadmin/commit/491ccf1f1315ac68f5b6f69f76f0... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M libraries/dbi/DBIDummy.class.php M test/classes/plugin/import/ImportLdi_test.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8f0f0c5bbef0...491ccf1f1315