From: Xinchen Hui <laruence@php.net>
Date: Wed, 5 Jun 2013 09:26:10 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0RC3~4^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f597f5561e658643d2f7f6e35c12b283760e1ac3;p=php

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

f597f5561e658643d2f7f6e35c12b283760e1ac3