From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Wed, 21 Mar 2012 12:43:51 +0000 (+0000)
Subject: Merge branch '5.4'
X-Git-Tag: php-5.5.0alpha1~411^2~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a19dba56d2b6335aac5e21b5afc6f5409f030cca;p=php

Merge branch '5.4'

Conflicts:
	NEWS
---

a19dba56d2b6335aac5e21b5afc6f5409f030cca