brought back that vs2012 fix
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