]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 086729b c02301b)
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)
* PHP-5.6:
  Better fix for #71952

Conflicts:
ext/gd/gd.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.