]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmb@php.net>
Sun, 24 Jul 2016 22:16:21 +0000 (00:16 +0200)
committerChristoph M. Becker <cmb@php.net>
Sun, 24 Jul 2016 22:16:21 +0000 (00:16 +0200)
commit4db4997ac5b903976d42688c62c0e2216ee6f052
tree300e9d3349d59a1aac6ee8eb8e123749ecf77215
parentad96a052d918c7fcfaab702c4319acac20435d6b
parentd28f1dae9dbe09b63539efe94a0ef449f6790438
Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/gd/tests/gd_info_variation1.phpt
ext/gd/tests/gd_info_variation1.phpt