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

Merge branch '5.4'
---

d4fd95e292d20c0ff256269bfb96abdc56fd7a17