Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b87db57245d9b6748191dbe7fa968b29f0c17dd https://github.com/phpmyadmin/phpmyadmin/commit/1b87db57245d9b6748191dbe7fa9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-30 (Tue, 30 Dec 2014)

Changed paths: M .travis.yml M ChangeLog M doc/config.rst M doc/setup.rst R examples/create_tables.sql R examples/create_tables_drizzle.sql R examples/upgrade_column_info_4_3_0+.sql R examples/upgrade_tables_mysql_4_1_2+.sql M libraries/config.default.php M libraries/relation.lib.php M libraries/vendor_config.php M scripts/create-release.sh A sql/create_tables.sql A sql/create_tables_drizzle.sql A sql/upgrade_column_info_4_3_0+.sql A sql/upgrade_tables_mysql_4_1_2+.sql

Log Message: ----------- bug #4675 phpMyAdmin should be able to work without 'examples' DIR - move SQL scripts to sql directory

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

Commit: dde279909bad33cb8f5cd5d62cf2e80a4978751e https://github.com/phpmyadmin/phpmyadmin/commit/dde279909bad33cb8f5cd5d62cf2... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-30 (Tue, 30 Dec 2014)

Changed paths: M libraries/Table.class.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/84b46d3b9986...dde279909bad