From: Xinchen Hui <laruence@php.net>
Date: Wed, 7 Nov 2012 09:08:34 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e222837f6eefa757619533266ed149ab5dd91940;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

e222837f6eefa757619533266ed149ab5dd91940