]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Mon, 20 Jan 2014 07:41:04 +0000 (08:41 +0100)
committerRemi Collet <remi@php.net>
Mon, 20 Jan 2014 07:41:04 +0000 (08:41 +0100)
* PHP-5.6:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714


Trivial merge