]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 428dddd fa05f03)
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 30 May 2012 23:16:42 +0000 (01:16 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 30 May 2012 23:16:42 +0000 (01:16 +0200)
* PHP-5.3:
  fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)


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