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

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

9776504c5bfa036608fc3fd1ae308c99615972b1