Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 685c1d3495347e37615b892ace83fd2339408696 https://github.com/phpmyadmin/phpmyadmin/commit/685c1d3495347e37615b892ace83... Author: Jørgen Thomsen <joergent@users.sf.net> Date: 2014-01-01 (Wed, 01 Jan 2014) Changed paths: M export.php Log Message: ----------- bug #4209 Missing compression in one case Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 69c24b78bb2d7d50a1d205f7ad13468e95d067d8 https://github.com/phpmyadmin/phpmyadmin/commit/69c24b78bb2d7d50a1d205f7ad13... Author: Marc Delisle <marc@infomarc.info> Date: 2014-01-01 (Wed, 01 Jan 2014) Changed paths: M ChangeLog M export.php Log Message: ----------- ChangeLog entry and fix explanation for bug #4209 Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: d0f18871fda09bb9038cf28b921410c9246da508 https://github.com/phpmyadmin/phpmyadmin/commit/d0f18871fda09bb9038cf28b9214... Author: Marc Delisle <marc@infomarc.info> Date: 2014-01-01 (Wed, 01 Jan 2014) Log Message: ----------- Merge commit '69c24b7' Commit: 08fb2d34790792244d1bc20b0e4d6304740c33d3 https://github.com/phpmyadmin/phpmyadmin/commit/08fb2d34790792244d1bc20b0e4d... Author: Marc Delisle <marc@infomarc.info> Date: 2014-01-01 (Wed, 01 Jan 2014) Changed paths: M ChangeLog M libraries/export.lib.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3f1672500d7c...08fb2d347907