Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fe7a2c095b9bc6e36185076f314d361b48055edd https://github.com/phpmyadmin/phpmyadmin/commit/fe7a2c095b9bc6e36185076f314d... Author: Marc Delisle marc@infomarc.info Date: 2015-10-21 (Wed, 21 Oct 2015)

Changed paths: M ChangeLog M export.php

Log Message: ----------- Fixes #11592 Missing headers in zipped export

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: f869dbccc627b92ecb5d7746488c1e6bfad3c197 https://github.com/phpmyadmin/phpmyadmin/commit/f869dbccc627b92ecb5d7746488c... Author: Marc Delisle marc@infomarc.info Date: 2015-10-21 (Wed, 21 Oct 2015)

Changed paths: M ChangeLog M export.php

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7bea48283cbe...f869dbccc627