From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 4 Apr 2012 08:13:02 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ea9fa1b4626f6125f25d8b0bcffac7becc1d092;p=php

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

3ea9fa1b4626f6125f25d8b0bcffac7becc1d092