Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9d27af821cf77be6ceab358a9a52f48205bc7613 https://github.com/phpmyadmin/phpmyadmin/commit/9d27af821cf77be6ceab358a9a52... Author: Michal Čihař michal@cihar.com Date: 2016-09-16 (Fri, 16 Sep 2016)

Changed paths: M ChangeLog M js/tbl_change.js

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

Commit: ea5870bb9b90b48865e4d28609ccb1b4ecb410d8 https://github.com/phpmyadmin/phpmyadmin/commit/ea5870bb9b90b48865e4d28609cc... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-09-18 (Sun, 18 Sep 2016)

Changed paths: M test/libraries/PMA_export_test.php

Log Message: ----------- Fix class name in export test comments

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 774e8d505b5a039d394275d3712064ad95c8c4c7 https://github.com/phpmyadmin/phpmyadmin/commit/774e8d505b5a039d394275d37120... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-09-18 (Sun, 18 Sep 2016)

Changed paths: M test/libraries/PMA_export_test.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4962a4304c32...774e8d505b5a