]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Tue, 8 May 2012 09:50:19 +0000 (11:50 +0200)
committerJohannes Schlüter <johannes@php.net>
Tue, 8 May 2012 09:50:19 +0000 (11:50 +0200)
* PHP-5.4:
  This will be PHP 5.3.14
  improve fix for CVE-2012-1823
  improve fix for CVE-2012-1823


Trivial merge