From: Felipe Pena <felipensp@gmail.com>
Date: Tue, 25 Jun 2013 21:01:46 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
X-Git-Tag: php-5.4.18RC1~45^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ab53f4b5e00d9291bdaa5df84c17e6b8c22e40f;p=php

Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
---

2ab53f4b5e00d9291bdaa5df84c17e6b8c22e40f