Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: bd68c54d1beeef79d237e8bfda44690834012a76 https://github.com/phpmyadmin/phpmyadmin/commit/bd68c54d1beeef79d237e8bfda44... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)

Changed paths: M ChangeLog M libraries/DatabaseInterface.class.php

Log Message: ----------- bug #4562 [security] XSS in debug SQL output

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 7b8962dede7631298c81e2c1cd267b81f1e08a8c https://github.com/phpmyadmin/phpmyadmin/commit/7b8962dede7631298c81e2c1cd26... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)

Changed paths: M ChangeLog M js/server_status_monitor.js

Log Message: ----------- bug #4563 [security] XSS in monitor query analyzer

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: d0e3ab3bc9da5a4ed24e485632471fef65cdb556 https://github.com/phpmyadmin/phpmyadmin/commit/d0e3ab3bc9da5a4ed24e48563247... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)

Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php

Log Message: ----------- 4.2.10.1 release

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

Commit: 3720bf33b43546ab4b80fdbf91b5a1557b8daba0 https://github.com/phpmyadmin/phpmyadmin/commit/3720bf33b43546ab4b80fdbf91b5... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)

Changed paths: M ChangeLog M README M doc/conf.py M js/server_status_monitor.js M libraries/Config.class.php M libraries/DatabaseInterface.class.php

Log Message: ----------- Merge branch 'MAINT_4_2_10' into STABLE

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/45a120ba574c...3720bf33b435