From: Xinchen Hui <laruence@php.net>
Date: Tue, 14 Aug 2012 16:47:08 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.7RC1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ba07c2ca3553b5c9982ea10996cbaeeb0c49ab9;p=php

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

3ba07c2ca3553b5c9982ea10996cbaeeb0c49ab9