From: Xinchen Hui <laruence@php.net>
Date: Fri, 3 Jan 2014 03:06:12 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~54^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7b62fe5a6a7c9602f835a6d5a6670bdb1cc172c;p=php

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

e7b62fe5a6a7c9602f835a6d5a6670bdb1cc172c