]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 4 Mar 2014 12:43:42 +0000 (13:43 +0100)
committerRemi Collet <remi@php.net>
Tue, 4 Mar 2014 12:43:42 +0000 (13:43 +0100)
* PHP-5.4:
  Improves fix for memory leak, keep in sync with upstream.


Trivial merge