From: Nikita Popov <nikic@php.net>
Date: Thu, 3 Mar 2016 15:38:13 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.5RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5527c5b083830ff148a8cef4a61f5fab537b89d5;p=php

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

5527c5b083830ff148a8cef4a61f5fab537b89d5