From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 6 Apr 2016 22:00:34 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~360
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c305c14f6e328d0dbaaa0f4ca744973383e6b00;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed build
---

3c305c14f6e328d0dbaaa0f4ca744973383e6b00