From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 3 Apr 2012 04:18:42 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7a36ad902ee09cd457d4e221f51266c5d76706e;p=php

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

e7a36ad902ee09cd457d4e221f51266c5d76706e