]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Mon, 29 Feb 2016 07:10:23 +0000 (15:10 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 29 Feb 2016 07:10:23 +0000 (15:10 +0800)
* PHP-7.0:
  Revert "Fixed test ext/readline/tests/readline_read_history_error_001.phpt"

1  2 
ext/readline/readline.c

Simple merge