From: Nikita Popov <nikic@php.net>
Date: Wed, 2 Jul 2014 20:40:33 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=213e9a0a3c6e6815f80f2c7696a589e3c13f2c18;p=php

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

213e9a0a3c6e6815f80f2c7696a589e3c13f2c18