From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 13 Dec 2013 03:37:43 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~119^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f95a07c411fa78092427c6edd2d867d0f085b73;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

6f95a07c411fa78092427c6edd2d867d0f085b73