From: Nikita Popov <nikic@php.net>
Date: Mon, 18 Apr 2016 20:46:36 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d79288c6bb4186a7f962445bb03bfbaa12b1ce4d;p=php

Merge branch 'PHP-7.0'
---

d79288c6bb4186a7f962445bb03bfbaa12b1ce4d