From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Wed, 23 May 2012 13:52:32 +0000 (+0200)
Subject: Merge branch '5.3' into 5.4
X-Git-Tag: php-5.4.4RC2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0838a2b7c559442aac4692a023d044f34c60d24f;p=php

Merge branch '5.3' into 5.4
---

0838a2b7c559442aac4692a023d044f34c60d24f