]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 20 Mar 2015 06:05:34 +0000 (23:05 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 20 Mar 2015 06:05:34 +0000 (23:05 -0700)
* PHP-5.4:
  add CVEs


Trivial merge