]> granicus.if.org Git - php/commit
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)
commit9e16493e721278d1c4c0affc3d3e6cbc7bbd2596
treee93358a5b9bf2793f5c15aa1978a484064cde3dd
parent0e25448e6ba62b83b6ee6ea8587e91d162f2ddea
parent97b86c3c4a6179acc13ab39bdd130f48f52d88e0
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  (re)add cve number in NEWS, from 5.4.29