]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:15:33 +0000 (12:15 +0100)
committerDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:15:33 +0000 (12:15 +0100)
commit443e3b4c9306333525806a0a9b23e56ba09e7938
tree540427d238c298d9470880ddab35d5c8f02022fa
parentc33aeb7d0641889997ca5b4be9ab9b963628d32a
parentf3f0ced4bbf119b55ae85002087484688d355f68
Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61461 (missing checks around malloc() calls).

Conflicts:
NEWS