From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 24 Jun 2016 13:14:02 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha3~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3440054ca8ac66196da534f76830cb0671ccb2f7;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed format

Conflicts:
	ext/opcache/zend_shared_alloc.c
---

3440054ca8ac66196da534f76830cb0671ccb2f7