]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Mon, 29 Aug 2016 13:44:13 +0000 (15:44 +0200)
committerAnatol Belski <ab@php.net>
Mon, 29 Aug 2016 13:44:13 +0000 (15:44 +0200)
* PHP-7.0:
  fix leak

1  2 
ext/standard/string.c

Simple merge