Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Mon, 18 Jul 2016 22:46:24 +0000 (00:46 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 18 Jul 2016 22:48:10 +0000 (00:48 +0200)
commitd565d4bc1cab2d695863a51eb6f998405b76c147
treec56b2a0480cbf189cd98045ec67f7654f612b899
parent31cbe23a9a4a47b922cd1f6db1a393c5dbdaad36
parent3c3980caa1437dce5d56e16b5c0ce7d3395b6266
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/gd/gd.c
NEWS
ext/gd/gd.c