]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Fri, 15 Jan 2016 14:48:24 +0000 (15:48 +0100)
committerAnatol Belski <ab@php.net>
Fri, 15 Jan 2016 14:48:24 +0000 (15:48 +0100)
* PHP-7.0:
  PS(id) is zend_string *, use appropriate API
  Update NEWS


Trivial merge