]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:28:21 +0000 (11:28 +0200)
committerRemi Collet <remi@php.net>
Tue, 3 Jun 2014 09:28:21 +0000 (11:28 +0200)
commit97b86c3c4a6179acc13ab39bdd130f48f52d88e0
tree3516dfd2022c2e3e59a12e1af51e9381fdb27384
parentf5333418d7e516ee55cdf29257fa216bf563fa26
parent0817a2c7679a2749f44ba5b17b4387ef000a3de3
Merge branch 'PHP-5.4' into PHP-5.5

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