Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0c1a01556808f02c5ee4b54c99b728d5a0f7652 https://github.com/phpmyadmin/phpmyadmin/commit/b0c1a01556808f02c5ee4b54c99b... Author: Marc Delisle marc@infomarc.info Date: 2014-05-06 (Tue, 06 May 2014)

Changed paths: M ChangeLog M js/sql.js

Log Message: ----------- bug #4385 Grid edit on sorted columns fails

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

Commit: 04210d1b0317b87d1563d7d1c5a19af652a79f19 https://github.com/phpmyadmin/phpmyadmin/commit/04210d1b0317b87d1563d7d1c5a1... Author: Marc Delisle marc@infomarc.info Date: 2014-05-06 (Tue, 06 May 2014)

Changed paths: M ChangeLog M js/sql.js

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e84e6c03054f...04210d1b0317