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


Trivial merge