Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d80406ed66f58f611ddfb8cf739ede43702cf897 https://github.com/phpmyadmin/phpmyadmin/commit/d80406ed66f58f611ddfb8cf739e... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-12-23 (Mon, 23 Dec 2013)

Changed paths: M libraries/StorageEngine.class.php M libraries/engines/binlog.lib.php M libraries/engines/innobase.lib.php M libraries/engines/mrg_myisam.lib.php M libraries/engines/performance_schema.lib.php M test/engines/PMA_StorageEngine_mrg_myisam_test.php

Log Message: ----------- Reduce coupling between storage engine names and their corresponding class names. Add some missing doc comments

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

Commit: 895bd1e3cdfd5c9aa3d54e110178e1ef8998d2c5 https://github.com/phpmyadmin/phpmyadmin/commit/895bd1e3cdfd5c9aa3d54e110178... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-12-23 (Mon, 23 Dec 2013)

Changed paths: M ChangeLog M README.rst M doc/config.rst M doc/faq.rst M libraries/DisplayResults.class.php M libraries/Scripts.class.php M libraries/config.values.php A libraries/config/ServerConfigChecks.class.php M libraries/config/messages.inc.php M libraries/config/user_preferences.forms.php M libraries/display_import.lib.php M libraries/mult_submits.lib.php M libraries/replication_gui.lib.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M libraries/structure.lib.php M libraries/tbl_indexes.lib.php M libraries/tbl_printview.lib.php M po/en_GB.po M po/ro.po M setup/frames/index.inc.php M setup/lib/index.lib.php M test/libraries/PMA_SetupIndex_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/652b351c4a7b...895bd1e3cdfd