]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Tue, 19 Apr 2016 06:34:26 +0000 (23:34 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 19 Apr 2016 06:34:26 +0000 (23:34 -0700)
commit086729bb6c4e88a61ff3ea470fac5d17c2d31786
tree5c655adaa25b7afdb68839cbc5eeda9ef8795865
parent5ea2b3625d78a5604ba33d91f0bd9bb187138220
parentf061867fd385109861d128ae6f3e2484fc4daa72
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #71952: Corruption inside imageaffinematrixget

Conflicts:
ext/gd/gd.c