From: Popa Adrian Marius <mariuz@php.net>
Date: Mon, 2 Apr 2012 07:03:25 +0000 (+0300)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ad9323fa2929057784c2edac60153d50fbfc32f;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
---

4ad9323fa2929057784c2edac60153d50fbfc32f