From: Stanislav Malyshev <stas@php.net>
Date: Wed, 18 Mar 2015 00:10:14 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14588c249904bc2cdaa84571ab60eecc27ea2096;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
---

14588c249904bc2cdaa84571ab60eecc27ea2096