]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 19:37:46 +0000 (20:37 +0100)
committerAnatol Belski <ab@php.net>
Fri, 29 Jan 2016 19:37:46 +0000 (20:37 +0100)
* PHP-5.6:
  add XFAIL
  Revert "fix leak in 5.6"


Trivial merge