]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Wed, 30 May 2012 06:14:09 +0000 (23:14 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 30 May 2012 06:14:09 +0000 (23:14 -0700)
* PHP-5.4:
  fix CVE-2012-2143


Trivial merge