Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ddd1eac48069ebd0d66acaea802cdcb3ee0fdeac https://github.com/phpmyadmin/phpmyadmin/commit/ddd1eac48069ebd0d66acaea802c... Author: Rouslan Placella <rouslan@placella.com> Date: 2012-06-11 (Mon, 11 Jun 2012) Changed paths: M ChangeLog M enum_editor.php M libraries/common.lib.php M sql.php Log Message: ----------- Fixed bug #3534311 - Grid editing incorrectly parses ENUM/SET values Commit: bf219df66dab3a7190d63f6226bbd7de33348956 https://github.com/phpmyadmin/phpmyadmin/commit/bf219df66dab3a7190d63f6226bb... Author: Rouslan Placella <rouslan@placella.com> Date: 2012-06-11 (Mon, 11 Jun 2012) Changed paths: M ChangeLog M libraries/common.lib.php M sql.php Log Message: ----------- Merge branch 'QA_3_5' Conflicts: enum_editor.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/445bd8c...bf219df