From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Thu, 24 May 2012 12:33:42 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: php-5.5.0alpha1~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=457a57d653400a70ff32de34c751026295b10b3d;p=php

Merge branch '5.4'
---

457a57d653400a70ff32de34c751026295b10b3d