From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 29 Dec 2015 07:49:52 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb1db49d0a071a9ae89c930ee7efa4a68b742972;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed info while setting opcache.file_cache_only
  Drop extra line
  Add CVE for #71105 (PHP 7.0.1)
---

cb1db49d0a071a9ae89c930ee7efa4a68b742972