From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Thu, 29 Mar 2012 07:47:58 +0000 (+0100)
Subject: Merge branch '5.3' into 5.4
X-Git-Tag: php-5.4.4RC1~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4873c68a600dcd0c6c548c9ecf2d605da878252;p=php

Merge branch '5.3' into 5.4

Conflicts:
	main/output.c
---

f4873c68a600dcd0c6c548c9ecf2d605da878252