From: Xinchen Hui <laruence@php.net>
Date: Fri, 25 Jul 2014 02:52:41 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC3~1^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=235d0241d1264085c2e24b0ed02d1fdff35b2313;p=php

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

235d0241d1264085c2e24b0ed02d1fdff35b2313