5.5.15 now
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix potential segfault in dns_get_record()
NEWS entry for Fix potential segfault in dns_get_record(
NEWS entry for "Fix potential segfault in dns_get_record()"
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS entry for "Fix potential segfault in dns_get_record()"
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