Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8c6261c73f01be939864bc7a048273452ad9b58a https://github.com/phpmyadmin/phpmyadmin/commit/8c6261c73f01be939864bc7a0482... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-09 (Thu, 09 Jul 2015)

Changed paths: M config.sample.inc.php M doc/config.rst M examples/config.manyhosts.inc.php M libraries/DisplayResults.class.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/display_export.inc.php M libraries/display_export.lib.php M libraries/export.lib.php M libraries/relation.lib.php M sql/create_tables.sql M sql/create_tables_drizzle.sql M tbl_export.php M test/libraries/PMA_relation_cleanup_test.php

Log Message: ----------- Underscores are preferred to separate words in configuration storage table names/directives

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

Commit: bb729d7d7f074c330fe56b27913fce52b67f0d8d https://github.com/phpmyadmin/phpmyadmin/commit/bb729d7d7f074c330fe56b27913f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-09 (Thu, 09 Jul 2015)

Changed paths: M po/fr.po M po/ia.po M po/kn.po M po/sl.po M po/tr.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9dc2d6fe0486...bb729d7d7f07