Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5c11808271a68c09031fcfc4e86cd157c45e7431 https://github.com/phpmyadmin/phpmyadmin/commit/5c11808271a68c09031fcfc4e86c... Author: Marc Delisle marc@infomarc.info Date: 2015-06-18 (Thu, 18 Jun 2015)

Changed paths: M doc/config.rst

Log Message: ----------- Output of DBG sql is now integrated to the console

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: cb942d3675c59d55059c132fbdb9cb74f18e4eaa https://github.com/phpmyadmin/phpmyadmin/commit/cb942d3675c59d55059c132fbdb9... Author: Marc Delisle marc@infomarc.info Date: 2015-06-18 (Thu, 18 Jun 2015)

Changed paths: M test/classes/schema/Dia_Relation_Schema_test.php M test/classes/schema/Eps_Relation_Schema_test.php M test/classes/schema/Pdf_Relation_Schema_test.php M test/classes/schema/Svg_Relation_Schema_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/761403517e3a...cb942d3675c5