]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 6 Dec 2016 13:37:58 +0000 (14:37 +0100)
committerAnatol Belski <ab@php.net>
Tue, 6 Dec 2016 13:37:58 +0000 (14:37 +0100)
* PHP-7.0:
  fix leak, take on 5.6


Trivial merge