From: Xinchen Hui <laruence@php.net>
Date: Wed, 19 Sep 2012 11:44:18 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~30^2~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4571d7824a03783c7c82bf077d19a1d51a0a8c36;p=php

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

4571d7824a03783c7c82bf077d19a1d51a0a8c36