]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Wed, 11 Jun 2014 21:42:26 +0000 (21:42 +0000)
committerAdam Harvey <aharvey@php.net>
Wed, 11 Jun 2014 21:42:26 +0000 (21:42 +0000)
* PHP-5.4:
  NEWS entry for "Fix potential segfault in dns_get_record()"


Trivial merge