]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Thu, 14 Jan 2016 17:41:22 +0000 (18:41 +0100)
committerAnatol Belski <ab@php.net>
Thu, 14 Jan 2016 17:41:22 +0000 (18:41 +0100)
* PHP-7.0:
  port 4308c868f94df1f2b99e80038ba5ea1076d919a7 to 7.0


Trivial merge