From: Stanislav Malyshev <stas@php.net>
Date: Wed, 24 Apr 2013 04:46:03 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1363626f114c65808c32c33ac569dc86b52482e2;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
---

1363626f114c65808c32c33ac569dc86b52482e2