]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 17:54:35 +0000 (18:54 +0100)
committerAnatol Belski <ab@php.net>
Thu, 20 Feb 2014 17:54:35 +0000 (18:54 +0100)
* PHP-5.4:
  fixed leak introduced after CVE/upgrade


Trivial merge