]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Mon, 20 Jun 2016 13:20:58 +0000 (15:20 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 20 Jun 2016 13:20:58 +0000 (15:20 +0200)
1  2 
ext/gd/libgd/gd.c

Simple merge