Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c51817d3b8cb05ff54dca9373c0667e29b8498d4 https://github.com/phpmyadmin/phpmyadmin/commit/c51817d3b8cb05ff54dca9373c06... Author: Marc Delisle marc@infomarc.info Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths: M ChangeLog M show_config_errors.php

Log Message: ----------- [security] Fixed local path disclosure vulnerability, see PMASA-2012-2

Commit: 9c0a377c723635bf14604e3abb5c2e4d1d89c63a https://github.com/phpmyadmin/phpmyadmin/commit/9c0a377c723635bf14604e3abb5c... Author: Marc Delisle marc@infomarc.info Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths: M show_config_errors.php

Log Message: ----------- Merge branch 'MAINT_3_4_10' into QA_3_4

Commit: a183e6310e5fad296df6397570a0d89cb1140bee https://github.com/phpmyadmin/phpmyadmin/commit/a183e6310e5fad296df6397570a0... Author: Marc Delisle marc@infomarc.info Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths: M ChangeLog

Log Message: ----------- Fix merge conflicts

Commit: 6bbeed3e7eda8707fc89dd1babdef146d42c06e8 https://github.com/phpmyadmin/phpmyadmin/commit/6bbeed3e7eda8707fc89dd1babde... Author: Marc Delisle marc@infomarc.info Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths: M ChangeLog M po/ja.po M show_config_errors.php

Log Message: ----------- Merge branch 'QA_3_4' into MAINT_3_5_0

Commit: 957ef1cf7fc51577a0d993c76915bc30b0fa106d https://github.com/phpmyadmin/phpmyadmin/commit/957ef1cf7fc51577a0d993c76915... Author: Marc Delisle marc@infomarc.info Date: 2012-03-28 (Wed, 28 Mar 2012)

Changed paths: M ChangeLog M show_config_errors.php

Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a5bee26...957ef1c