Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ca9ad6015a6e2f60933f7113d650b085096b4d79 https://github.com/phpmyadmin/phpmyadmin/commit/ca9ad6015a6e2f60933f7113d650... Author: Marc Delisle marc@infomarc.info Date: 2014-07-07 (Mon, 07 Jul 2014)

Changed paths: M ChangeLog M libraries/sql.lib.php M sql.php

Log Message: ----------- Undefined variable when grid editing a foreign key column

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

Commit: 5aee5210307a6ee7cb327d8e1696101d414234a6 https://github.com/phpmyadmin/phpmyadmin/commit/5aee5210307a6ee7cb327d8e1696... Author: Marc Delisle marc@infomarc.info Date: 2014-07-07 (Mon, 07 Jul 2014)

Changed paths: M ChangeLog M libraries/sql.lib.php M sql.php

Log Message: ----------- Merge branch 'QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3df49ec54c1d...5aee5210307a