Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ceeec424d7dd3ee499d09e4ade7519c2a1f3769c https://github.com/phpmyadmin/phpmyadmin/commit/ceeec424d7dd3ee499d09e4ade75... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M ChangeLog M libraries/display_import.lib.php Log Message: ----------- #11728 CSV import skip row count after Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: 76a416283aac635cdd189ab8f8b8c35f4fb50da2 https://github.com/phpmyadmin/phpmyadmin/commit/76a416283aac635cdd189ab8f8b8... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-12-11 (Fri, 11 Dec 2015) Changed paths: M test/classes/plugin/export/PMA_ExportXml_test.php Log Message: ----------- Fix failing tests Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d9279025f90c...76a416283aac