]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 08:00:51 +0000 (01:00 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 08:00:51 +0000 (01:00 -0700)
* PHP-5.4:
  Fix memory leak in TSRM


Trivial merge