From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 29 Feb 2016 07:08:11 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb4d2f65779d717b653fcccceecd2d83a9206d10;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test ext/readline/tests/readline_read_history_error_001.phpt
---

bb4d2f65779d717b653fcccceecd2d83a9206d10