From: Xinchen Hui <laruence@php.net>
Date: Thu, 25 Jul 2013 14:44:19 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~12^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9126909c08271b24cb42850b0bf888adf5992e30;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

9126909c08271b24cb42850b0bf888adf5992e30