From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Mon, 19 Mar 2012 17:50:13 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' of git.php.net:/php-src into 5.4
X-Git-Tag: PHP-5.4.1-RC1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5f5ca5d77cfe47b9556b3cc37fbf9605b822e5c;p=php

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

f5f5ca5d77cfe47b9556b3cc37fbf9605b822e5c