From: Xinchen Hui <laruence@php.net>
Date: Sun, 5 Aug 2012 04:46:55 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.7RC1~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=346b3ff0948334741d206b2ad8ff6637ccadb34d;p=php

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

346b3ff0948334741d206b2ad8ff6637ccadb34d