]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Wed, 11 Jun 2014 21:43:39 +0000 (21:43 +0000)
committerAdam Harvey <aharvey@php.net>
Wed, 11 Jun 2014 21:43:39 +0000 (21:43 +0000)
commitaf26a28ac0d217b2d30409373dd54e070566b173
treea5e3539b465a3fad571fdd3ad70aa07bd41b7810
parent1ba338624b16e887576cc28ad30fabf47a16f8cf
parent16e0dcea72b11d83b3806e8800e731098ed990c9
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