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

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

6bafbb9abf3d5050f732fa263b188f0089c52b0e