From: Christoph M. Becker <cmb@php.net>
Date: Sat, 1 Aug 2015 12:21:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta3~5^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7c2128702c16777445e8c6b5ae856656bb47939;p=php

Merge branch 'PHP-5.6'
---

f7c2128702c16777445e8c6b5ae856656bb47939