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

Merge branch '5.4'
---

2eb069aa48c63a59aa8ed579eebe0e6e30b2833a