]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Wed, 20 Apr 2016 06:45:21 +0000 (23:45 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 20 Apr 2016 06:45:21 +0000 (23:45 -0700)
commit7d93363bd9ea03c11bfbeea03645260506ef9a2e
tree5c655adaa25b7afdb68839cbc5eeda9ef8795865
parent086729bb6c4e88a61ff3ea470fac5d17c2d31786
parentc02301b666f61e73da3ae73f712823cf64a9299d
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Better fix for #71952

Conflicts:
ext/gd/gd.c