From: Nikita Popov <nikic@php.net>
Date: Thu, 5 May 2016 15:31:25 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59f35c0ca9abfa72c5393f6c0350759a3f6512d8;p=php

Merge branch 'PHP-7.0'

Conflicts:
	Zend/zend_builtin_functions.c
---

59f35c0ca9abfa72c5393f6c0350759a3f6512d8