From: Xinchen Hui <laruence@php.net>
Date: Mon, 2 Sep 2013 08:16:07 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.4RC1~2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2ee1b629e6b48b43fa6d17a040a2a0ee69caddc;p=php

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

b2ee1b629e6b48b43fa6d17a040a2a0ee69caddc