Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2693ad8699967eaf304a9336bd517404aa823776 https://github.com/phpmyadmin/phpmyadmin/commit/2693ad8699967eaf304a9336bd51... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths: M libraries/export.lib.php M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Dump all metadata at the end

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

Commit: 50d5db06432638379ebd753906b8615788f1dcef https://github.com/phpmyadmin/phpmyadmin/commit/50d5db06432638379ebd753906b8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths: M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Remove id field from some of the metadata

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

Commit: ecf39c83648604b84bcee11bda18cd6646d9a7a8 https://github.com/phpmyadmin/phpmyadmin/commit/ecf39c83648604b84bcee11bda18... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-23 (Thu, 23 Apr 2015)

Changed paths: M libraries/normalization.lib.php M libraries/tbl_columns_definition_form.inc.php M libraries/tbl_columns_definition_form.lib.php M po/zh_TW.po M test/libraries/PMA_tbl_columns_definition_form_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1b03849e5503...ecf39c836486