]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 21 Jan 2017 01:57:54 +0000 (02:57 +0100)
committerAnatol Belski <ab@php.net>
Sat, 21 Jan 2017 01:57:54 +0000 (02:57 +0100)
* PHP-7.0:
  backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0


Trivial merge