]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 19 Aug 2014 06:40:30 +0000 (08:40 +0200)
committerRemi Collet <remi@php.net>
Tue, 19 Aug 2014 06:40:30 +0000 (08:40 +0200)
* PHP-5.4:
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597


Trivial merge