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

Merge branch '5.4'
---

adf2fba307f404910a47a94cf34f2ddd45c0cd56