From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Wed, 23 May 2012 13:52:47 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: php-5.5.0alpha1~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca515e807319cafb5ad5c7384422583fb633aa57;p=php

Merge branch '5.4'
---

ca515e807319cafb5ad5c7384422583fb633aa57