]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Tue, 20 Oct 2015 18:07:36 +0000 (20:07 +0200)
committerAnatol Belski <ab@php.net>
Tue, 20 Oct 2015 18:07:36 +0000 (20:07 +0200)
* PHP-7.0:
  backport 262160e and 2d55e8c into 5.6


Trivial merge