Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b69bb373617fd4866deb50bf86ad19e727802a77 https://github.com/phpmyadmin/phpmyadmin/commit/b69bb373617fd4866deb50bf86ad... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-08 (Mon, 08 Dec 2014)

Changed paths: M ChangeLog M libraries/relation.lib.php M libraries/vendor_config.php

Log Message: ----------- bug #4627 "file_get_contents(examples/create_tables.sql): failed to open stream" after update

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

Commit: bcc11ba137e850364e9d7c28167735817873a6d0 https://github.com/phpmyadmin/phpmyadmin/commit/bcc11ba137e850364e9d7c281677... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-08 (Mon, 08 Dec 2014)

Changed paths: M ChangeLog M libraries/relation.lib.php M libraries/vendor_config.php

Log Message: ----------- Merge branch 'QA_4_3'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/60c5e7316ea8...bcc11ba137e8