]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorSara Golemon <pollita@php.net>
Wed, 11 Jun 2014 20:51:53 +0000 (13:51 -0700)
committerSara Golemon <pollita@php.net>
Wed, 11 Jun 2014 20:51:53 +0000 (13:51 -0700)
* PHP-5.5:
  Fix potential segfault in dns_get_record()


Trivial merge