]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorSara Golemon <pollita@php.net>
Wed, 11 Jun 2014 20:53:59 +0000 (13:53 -0700)
committerSara Golemon <pollita@php.net>
Wed, 11 Jun 2014 20:53:59 +0000 (13:53 -0700)
commitb34d7849ed90ced9345f8ea1c59bc8d101c18468
tree957e1c46d6be48a4e0137bc171547e729332136a
parentec974c439724e8b4151412eaa0caba5aec5e1c49
parente2ef56f760c6425d002454234c45c5e777d85058
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix potential segfault in dns_get_record()