From: Adam Harvey <aharvey@php.net>
Date: Wed, 11 Jun 2014 21:43:39 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~197^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af26a28ac0d217b2d30409373dd54e070566b173;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  5.5.15 now

Conflicts:
	configure.in
	main/php_version.h
---

af26a28ac0d217b2d30409373dd54e070566b173