From: Johannes Schlüter <johannes@php.net>
Date: Sat, 27 Sep 2014 00:18:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16b4167fdd817b5906e9ab22492911d14f033206;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

16b4167fdd817b5906e9ab22492911d14f033206