Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 40a82f60118ec03e7a209708d400f24ec51ed91d https://github.com/phpmyadmin/phpmyadmin/commit/40a82f60118ec03e7a209708d400... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-16 (Mon, 16 Feb 2015)

Changed paths: M ChangeLog M js/export.js

Log Message: ----------- bug #4769 Previously set column aliases are destroyed if returned to the same table

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 9ccc5322dc65c7b9ff3857ec14479bbbcab0af2e https://github.com/phpmyadmin/phpmyadmin/commit/9ccc5322dc65c7b9ff3857ec1447... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-16 (Mon, 16 Feb 2015)

Changed paths: M ChangeLog M js/export.js

Log Message: ----------- Merge branch 'QA_4_3'

Commit: d1e4c2b3c737f9b02c716e653da219e78a77b4cd https://github.com/phpmyadmin/phpmyadmin/commit/d1e4c2b3c737f9b02c716e653da2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-16 (Mon, 16 Feb 2015)

Changed paths: M test/libraries/PMA_display_export_test.php

Log Message: ----------- Update tests

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: f2d807e37484294a4f1d04e218b274df854ff00a https://github.com/phpmyadmin/phpmyadmin/commit/f2d807e37484294a4f1d04e218b2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-16 (Mon, 16 Feb 2015)

Changed paths: M po/lt.po M po/sk.po

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Commit: 048c54db49a4965cf4333de9a2363275c1206a55 https://github.com/phpmyadmin/phpmyadmin/commit/048c54db49a4965cf4333de9a236... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-16 (Mon, 16 Feb 2015)

Changed paths: M test/libraries/PMA_display_export_test.php

Log Message: ----------- Merge branch 'QA_4_3'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/968ae5bb1178...048c54db49a4