]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Mon, 27 Mar 2017 17:42:24 +0000 (19:42 +0200)
committerAnatol Belski <ab@php.net>
Mon, 27 Mar 2017 17:42:24 +0000 (19:42 +0200)
* PHP-7.0:
  deps updated, cherry-pick 88642decf9ab59d206db515990886b0761bfa835
  add test for bug #74230


Trivial merge