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

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

159602bd866edb2a3c8de7192864ef6aa7a0201d