From: Jakub Zelenka <bukka@php.net>
Date: Thu, 16 Jun 2016 19:11:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~23^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=307e546e1a41b51b0ff5fd918315c3626d7b6385;p=php

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

307e546e1a41b51b0ff5fd918315c3626d7b6385