From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 2 Mar 2016 04:31:30 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~545
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14f105ebba8f16e211b66a2177fe4faa67712efb;p=php

Merge branch 'PHP-7.0'

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

14f105ebba8f16e211b66a2177fe4faa67712efb