From: Xinchen Hui <laruence@php.net>
Date: Thu, 16 Jan 2014 06:41:52 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~23^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9799816e0cb3552f179cdc6c44ab2a9c99cfca7e;p=php

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

9799816e0cb3552f179cdc6c44ab2a9c99cfca7e