]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Wed, 3 Jan 2018 14:12:56 +0000 (15:12 +0100)
committerRemi Collet <remi@php.net>
Wed, 3 Jan 2018 14:12:56 +0000 (15:12 +0100)
* PHP-5.6:
  2018


Trivial merge