]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:28:43 +0000 (11:28 +0200)
committerRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:28:43 +0000 (11:28 +0200)
* PHP-5.5:
  (re)add cve number in NEWS, from 5.4.29


Trivial merge