Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d4730db69c29fa7da8cb67fdfe7e2a5eff123e2d https://github.com/phpmyadmin/phpmyadmin/commit/d4730db69c29fa7da8cb67fdfe7e... Author: Marc Delisle <marc@infomarc.info> Date: 2013-01-28 (Mon, 28 Jan 2013) Changed paths: M js/tbl_structure.js Log Message: ----------- Escape HTML for index drop confirmation message Commit: 7cd82758d3d6326fc8162c7f4cddcdc954f91617 https://github.com/phpmyadmin/phpmyadmin/commit/7cd82758d3d6326fc8162c7f4cdd... Author: Marc Delisle <marc@infomarc.info> Date: 2013-01-28 (Mon, 28 Jan 2013) Changed paths: M js/tbl_structure.js Log Message: ----------- Merge branch 'MAINT_3_5_6' into QA_3_5 Commit: 2dc656b943a9ddc8c27eb5c5659d39fc1c972674 https://github.com/phpmyadmin/phpmyadmin/commit/2dc656b943a9ddc8c27eb5c5659d... Author: Marc Delisle <marc@infomarc.info> Date: 2013-01-28 (Mon, 28 Jan 2013) Changed paths: M js/tbl_structure.js Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0f85d83d5834...2dc656b943a9