]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 607b0f9 a3f09eb)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 09:04:50 +0000 (02:04 -0700)
committerStanislav Malyshev <stas@php.net>
Thu, 8 May 2014 09:04:50 +0000 (02:04 -0700)
* PHP-5.6:
  oops, 5.4 and 5.5 use malloc in TSRM


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.