Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0f0c2f1e2b3ece41cc1bb99a9931c8fcc7c917bc https://github.com/phpmyadmin/phpmyadmin/commit/0f0c2f1e2b3ece41cc1bb99a9931... Author: J.M me@mynetx.net Date: 2012-07-31 (Tue, 31 Jul 2012)

Changed paths: M ChangeLog M show_config_errors.php

Log Message: ----------- - [security] Fixed local path disclosure vulnerability

Commit: 45de0c0d984b0dadf93809b4596e581f44347be1 https://github.com/phpmyadmin/phpmyadmin/commit/45de0c0d984b0dadf93809b4596e... Author: Marc Delisle marc@infomarc.info Date: 2012-08-03 (Fri, 03 Aug 2012)

Changed paths: M ChangeLog M show_config_errors.php

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

Commit: 216878b98719e88bb57321f96f744b73763e95c2 https://github.com/phpmyadmin/phpmyadmin/commit/216878b98719e88bb57321f96f74... Author: Marc Delisle marc@infomarc.info Date: 2012-08-03 (Fri, 03 Aug 2012)

Changed paths: M ChangeLog

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c91da3324680...216878b98719