]> granicus.if.org Git - php/commit
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)
commit16e0dcea72b11d83b3806e8800e731098ed990c9
tree68c4e2a7d9dc3f1e43b736ffb3f51afaecfc67f0
parentace35a3d3b38fc80f73f774826fd5d3ae14e8a28
parent5f2a30e11197fd1bc2394ee23cf80c7ea2ea9660
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS entry for "Fix potential segfault in dns_get_record()"