]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 21 Jun 2016 13:21:26 +0000 (15:21 +0200)
committerAnatol Belski <ab@php.net>
Tue, 21 Jun 2016 13:21:26 +0000 (15:21 +0200)
* PHP-5.6:
  re-fix leak
  Revert "fix leak"


Trivial merge