From: Xinchen Hui <laruence@gmail.com>
Date: Sat, 24 Mar 2012 06:22:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
X-Git-Tag: php-5.4.1RC1~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=503e9d955c79f60abd92cd362a927056f76fb14d;p=php

Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
---

503e9d955c79f60abd92cd362a927056f76fb14d