From: Xinchen Hui <laruence@php.net>
Date: Wed, 9 Jan 2013 02:54:23 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~5^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15aaa9c6605b9ee5dfd568a13704f36a721433a0;p=php

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

15aaa9c6605b9ee5dfd568a13704f36a721433a0