Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 66fe475d4f51b1761719cb0cab360748800373f7 https://github.com/phpmyadmin/phpmyadmin/commit/66fe475d4f51b1761719cb0cab36... Author: Marc Delisle <marc@infomarc.info> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M ChangeLog Log Message: ----------- ChangeLog entry for Improved protection against cross framing Commit: 5d946eaf579af5abca4ff1ed8ef6f2f342f9ae7f https://github.com/phpmyadmin/phpmyadmin/commit/5d946eaf579af5abca4ff1ed8ef6... Author: Marc Delisle <marc@infomarc.info> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M ChangeLog Log Message: ----------- Merge branch 'MAINT_4_0_5' into QA_4_0 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/965105c14c56...5d946eaf579a