From: Anatol Belski <ab@php.net>
Date: Tue, 19 Aug 2014 07:38:13 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6070757c77a226fecce5f2d029084cf68c979762;p=php

Merge branch 'master' of git.php.net:php-src

# 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
---

6070757c77a226fecce5f2d029084cf68c979762