]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorFerenc Kovacs <tyrael@php.net>
Wed, 6 Jan 2016 14:50:10 +0000 (15:50 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 6 Jan 2016 14:50:10 +0000 (15:50 +0100)
* PHP-7.0:
  these will be part of 5.6.17 not 5.6.18
  Removed unecessary string dup
  Moved buffer from heap to stack


Trivial merge