Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0181fa9400482b0bc35d38384c321e078e4cb133 https://github.com/phpmyadmin/phpmyadmin/commit/0181fa9400482b0bc35d38384c32... Author: Kari Söderholm haprog@haprogszone.net Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php

Log Message: ----------- Fix regression: Missing removeCRLF option in ExportCsv and ExportExcel plugins.

Commit: 0a13fa1938a3da3fefa9c7dfcb8761ba77004aa8 https://github.com/phpmyadmin/phpmyadmin/commit/0a13fa1938a3da3fefa9c7dfcb87... Author: Kari Söderholm haprog@haprogszone.net Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M export.php

Log Message: ----------- Fix missing post params in export.php for removeCRLF option in ExportCsv and ExportExcel plugins.

This is needed after commit a564d981e9ef5022d69b2720d6a6126c73c74637

Commit: be6d6733d9fc99f125e6ab0c893c604ec2845aa8 https://github.com/phpmyadmin/phpmyadmin/commit/be6d6733d9fc99f125e6ab0c893c... Author: Marc Delisle marc@infomarc.info Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog entry for pull request 409

Commit: 47652894f7ca0ee9cf02bc03346588f65ecb6db5 https://github.com/phpmyadmin/phpmyadmin/commit/47652894f7ca0ee9cf02bc033465... Author: Marc Delisle marc@infomarc.info Date: 2013-06-10 (Mon, 10 Jun 2013)

Changed paths: M ChangeLog M export.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php

Log Message: ----------- Merge branch 'QA_4_0'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a93592b076d1...47652894f7ca