]> granicus.if.org Git - php/commit
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)
commita444900c8df384f51bdfe5a8fe867a2a40978fe7
treefd855333a36d8ff20d0c8f7edad6ed2b48c35923
parent8e2d396b52de88f299882b872a3603a4c37644a5
parent0cc18fdfbae82ab533d74e730bb89240fba535d4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix memory leak in TSRM