Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dc969a9ae507d3cebc4f2466913e3f64228e50a6 https://github.com/phpmyadmin/phpmyadmin/commit/dc969a9ae507d3cebc4f2466913e... Author: Marc Delisle marc@infomarc.info Date: 2012-11-10 (Sat, 10 Nov 2012)

Changed paths: M ChangeLog M export.php

Log Message: ----------- bug #3563824 [export] Support Apache mod_deflate

Commit: 98d290f6e53d176c2665562a7c29bc3218f6194d https://github.com/phpmyadmin/phpmyadmin/commit/98d290f6e53d176c2665562a7c29... Author: Marc Delisle marc@infomarc.info Date: 2012-11-10 (Sat, 10 Nov 2012)

Changed paths: M ChangeLog M export.php

Log Message: ----------- Fix merge conflicts

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/964f299be618...98d290f6e53d