]> granicus.if.org Git - php/commit
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)
commit0c709cc2dc2932bd831d40a2f8db80308c0b913e
tree9ad649ee6ac016285d85c30af4f657659237598d
parent27f5957e9f5e8526033d946aaa02ad3bb07023b6
parenta444900c8df384f51bdfe5a8fe867a2a40978fe7
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix memory leak in TSRM
ext/bz2/bz2.c