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

1  2 
ext/bz2/bz2.c

diff --cc ext/bz2/bz2.c
Simple merge