Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5873c498e9e657b74ed3616311063a4669eaac5c https://github.com/phpmyadmin/phpmyadmin/commit/5873c498e9e657b74ed361631106... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-09 (Fri, 09 Aug 2013) Changed paths: M ChangeLog M export.php Log Message: ----------- bug #4025 gzip export is not actually compressed with mod_deflate Commit: a803797e51e7e6b1b97b02cde3a7f2b181d0093c https://github.com/phpmyadmin/phpmyadmin/commit/a803797e51e7e6b1b97b02cde3a7... Author: Marc Delisle <marc@infomarc.info> Date: 2013-08-09 (Fri, 09 Aug 2013) Changed paths: M ChangeLog M export.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/19a7a19a615e...a803797e51e7