]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 09:02:42 +0000 (02:02 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 09:04:11 +0000 (02:04 -0700)
commita3f09eb323986fa8e8c4c6e398071eedc6add02e
treeac775d2c5df598e813fc210e4ad834ade9869842
parentaa1a25e303220db8cf829d686cf9ed03a2225d6e
parentcf2b9955d4c26393f6d16b71b5c2c69d8d2b7f52
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  oops, 5.4 and 5.5 use malloc in TSRM
ext/bz2/bz2.c