From: Christoph M. Becker <cmb@php.net>
Date: Thu, 16 Jun 2016 12:06:39 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.1.0alpha2~23^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60feda4ea43498fa9154d957299d4d5be036a131;p=php

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

60feda4ea43498fa9154d957299d4d5be036a131