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

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

12230c66b1eaf99d2e3ca59af8a6a420dbf065bf