]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4f463c 633cc42)
Merge branch 'master' of git.php.net:php-src
authorAnatol Belski <ab@php.net>
Tue, 19 Aug 2014 07:38:13 +0000 (09:38 +0200)
committerAnatol Belski <ab@php.net>
Tue, 19 Aug 2014 07:38:13 +0000 (09:38 +0200)
# By Remi Collet
# Via Remi Collet
* 'master' of git.php.net:php-src:
  fix merge issue in previous (again)
  fix merge issue in previous
  NEWS
  NEWS
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.