]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Thu, 16 Jun 2016 12:06:39 +0000 (14:06 +0200)
committerChristoph M. Becker <cmb@php.net>
Thu, 16 Jun 2016 12:06:39 +0000 (14:06 +0200)
1  2 
ext/gd/libgd/gd.c

Simple merge