Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 012464268420e53a9cd81cbb4a43988d70393c36 https://github.com/phpmyadmin/phpmyadmin/commit/012464268420e53a9cd81cbb4a43... Author: Marc Delisle <marc@infomarc.info> Date: 2013-06-28 (Fri, 28 Jun 2013) Changed paths: M ChangeLog M import.php Log Message: ----------- [security] Global variables scope injection vulnerability (see PMASA-2013-7) Commit: 43b75a7a4f3a8074beff0a903f35ba000c4f76a6 https://github.com/phpmyadmin/phpmyadmin/commit/43b75a7a4f3a8074beff0a903f35... Author: Marc Delisle <marc@infomarc.info> Date: 2013-06-30 (Sun, 30 Jun 2013) Changed paths: M ChangeLog Log Message: ----------- 4.0.4.1 release date Commit: 42d6983d062b5900e251ece107b75802a41c4792 https://github.com/phpmyadmin/phpmyadmin/commit/42d6983d062b5900e251ece107b7... Author: Marc Delisle <marc@infomarc.info> Date: 2013-06-30 (Sun, 30 Jun 2013) Changed paths: M ChangeLog M import.php Log Message: ----------- Fix merge conflict Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a16600ddb8c9...42d6983d062b