From: Xinchen Hui <laruence@php.net>
Date: Mon, 17 Dec 2012 04:57:37 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f7f57a4071a2587698d0e18d89df16e532c5ec0;p=php

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

2f7f57a4071a2587698d0e18d89df16e532c5ec0