Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 29a1f56495a7d1d98da31a614f23c0819a606a4d https://github.com/phpmyadmin/phpmyadmin/commit/29a1f56495a7d1d98da31a614f23... Author: Marc Delisle marc@infomarc.info Date: 2014-07-17 (Thu, 17 Jul 2014)

Changed paths: M ChangeLog M js/functions.js M js/tbl_structure.js

Log Message: ----------- bug #4492 [security] XSS in AJAX confirmation messages

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

Commit: 75aa2e8cd2ee16b4a21444fe36987391f75fea43 https://github.com/phpmyadmin/phpmyadmin/commit/75aa2e8cd2ee16b4a21444fe3698... Author: Marc Delisle marc@infomarc.info Date: 2014-07-17 (Thu, 17 Jul 2014)

Changed paths: M ChangeLog M js/functions.js M js/tbl_structure.js

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e56c401b26cb...75aa2e8cd2ee