From: Nikita Popov <nikic@php.net>
Date: Fri, 9 Oct 2015 21:28:58 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha1~997^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d677b25b1c5fba2451ddeedb22cad29e1cda15cb;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

d677b25b1c5fba2451ddeedb22cad29e1cda15cb