Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cd097656758f981f80fb9029c7d6b4294582b706 https://github.com/phpmyadmin/phpmyadmin/commit/cd097656758f981f80fb9029c7d6... Author: Marc Delisle marc@infomarc.info Date: 2015-10-23 (Fri, 23 Oct 2015)

Changed paths: M ChangeLog M url.php

Log Message: ----------- Port content spoofing fix

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

Commit: 8a1e3f13d48c4719957a9a790d9f27451cb6e305 https://github.com/phpmyadmin/phpmyadmin/commit/8a1e3f13d48c4719957a9a790d9f... Author: Marc Delisle marc@infomarc.info Date: 2015-10-23 (Fri, 23 Oct 2015)

Changed paths: M ChangeLog M url.php

Log Message: ----------- Merge branch 'MAINT_4_5_1' into QA_4_5

Commit: e6f99a5113ab9ae62ab2aaf5bc2548ad09bcb2c5 https://github.com/phpmyadmin/phpmyadmin/commit/e6f99a5113ab9ae62ab2aaf5bc25... Author: Marc Delisle marc@infomarc.info Date: 2015-10-23 (Fri, 23 Oct 2015)

Changed paths: M ChangeLog M url.php

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/687821b67b16...e6f99a5113ab