From: Nikita Popov <nikic@php.net>
Date: Thu, 15 Oct 2015 20:14:55 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~960
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdb14346dce221842310f237a7fa8029bda5d5cc;p=php

Merge branch 'PHP-7.0'
---

fdb14346dce221842310f237a7fa8029bda5d5cc