Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dadecaf393a7814e49ca0b50dc16b90a08c0fc1d https://github.com/phpmyadmin/phpmyadmin/commit/dadecaf393a7814e49ca0b50dc16... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-30 (Tue, 30 Jun 2015)

Changed paths: M export.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportXml.class.php M test/classes/plugin/export/PMA_ExportHtmlword_test.php M test/classes/plugin/export/PMA_ExportSql_test.php M test/classes/plugin/export/PMA_ExportXml_test.php

Log Message: ----------- Match the name of corresponding config value.

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

Commit: 9b6561e2e37efea88565e2c4561623118d0fafb6 https://github.com/phpmyadmin/phpmyadmin/commit/9b6561e2e37efea88565e2c45616... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-30 (Tue, 30 Jun 2015)

Changed paths: M db_designer.php M js/tbl_structure.js M libraries/Footer.class.php M libraries/db_designer.lib.php M libraries/dbi/DBIDummy.class.php M libraries/sql.lib.php M libraries/structure.lib.php M po/el.po M sql/create_tables.sql M sql/create_tables_drizzle.sql M test/classes/PMA_Footer_test.php M test/classes/PMA_Util_test.php M test/classes/navigation/PMA_Node_Database_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/438fb14713fe...9b6561e2e37e