From: Andrey Hristov <andrey@php.net>
Date: Tue, 28 Jan 2014 13:24:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.10RC1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a87125c1e8cf98c3b6f5296de136d466ae3cdb9f;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

a87125c1e8cf98c3b6f5296de136d466ae3cdb9f