From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Fri, 23 Mar 2012 22:14:36 +0000 (+0000)
Subject: Merge branch '5.3' into 5.4
X-Git-Tag: php-5.4.1RC1~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e018e2ae8630dc1bfc6b9037ae9277b373020521;p=php

Merge branch '5.3' into 5.4
---

e018e2ae8630dc1bfc6b9037ae9277b373020521